Michael Niedermayer 71d008ebe4 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: 2a3c36e920
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-08-04 06:11:34 +02:00

80 KiB

Raw Blame History

View Raw