generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-08-04 05:44:00 +02:00
parent 2a3c36e920 1ef9e83764
commit 71d008ebe4
5 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/APIchanges
View File

@@ -15,9 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first:
2014-08-04 - xxxxxxx - lavc 55.72.101 - avcodec.h
2014-08-04 - xxxxxxx - lavu 52.95.100 - frame.h
Deprecate AVCodecContext.dtg_active_format and use side-data instead
2014-08-04 - xxxxxxx - lavc 55.72.101 / 55.57.2 - avcodec.h
2014-08-04 - xxxxxxx - lavu 52.95.100 / 53.20.0 - frame.h
Deprecate AVCodecContext.dtg_active_format and use side-data instead.
2014-08-03 - xxxxxxx - lavc 55.72.100 - avcodec.h
Add get_pixels() to AVDCT