Michael Niedermayer 68c05185e2 Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f' ...

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

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

2014-05-18 13:00:50 +02:00

75 KiB

Raw Blame History

View Raw