[FFmpeg-cvslog] Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 13:00:50 2014 +0200| [68c05185e229b093bf5c2236c2883cbc296ea938] | committer: Michael Niedermayer

Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'

* commit 'fd056029f45a9f6d213d9fce8165632042511d4f':
  lavc: add avcodec_free_context().

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68c05185e229b093bf5c2236c2883cbc296ea938
---