aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libvo-aacenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 05:44:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 06:11:34 +0200
commit71d008ebe4f96974433eecfd3575bc82eb4b06a8 (patch)
tree6b898f04697be62866d297dfd300e591b37c9924 /libavcodec/libvo-aacenc.c
parent2a3c36e920d958e99fb4edf065a6713c30f2c2a9 (diff)
parent1ef9e8376466bb1e2c147e47554b94cab9c8b04a (diff)
downloadffmpeg-71d008ebe4f96974433eecfd3575bc82eb4b06a8.tar.gz
Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a': avcodec: Deprecate dtg_active_format field in favor of avframe side-data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/mpeg12dec.c libavcodec/version.h libavfilter/vf_showinfo.c libavutil/frame.h libavutil/version.h See: 2a3c36e920d958e99fb4edf065a6713c30f2c2a9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvo-aacenc.c')
0 files changed, 0 insertions, 0 deletions