Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 03:44:00 +0000 (05:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 04:11:34 +0000 (06:11 +0200)
commit71d008ebe4f96974433eecfd3575bc82eb4b06a8
tree6b898f04697be62866d297dfd300e591b37c9924
parent2a3c36e920d958e99fb4edf065a6713c30f2c2a9
parent1ef9e8376466bb1e2c147e47554b94cab9c8b04a
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpeg12dec.c
libavfilter/vf_showinfo.c
libavutil/frame.h