Michael Niedermayer 44967ab60a Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671' ...

* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
  lavc: deprecate avcodec_get_frame_defaults().

Conflicts:
	libavcodec/version.h

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

2013-12-12 00:32:15 +01:00

68 KiB

Raw Blame History

View Raw