diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 05:44:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 06:11:34 +0200 |
| commit | 71d008ebe4f96974433eecfd3575bc82eb4b06a8 (patch) | |
| tree | 6b898f04697be62866d297dfd300e591b37c9924 /doc | |
| parent | 2a3c36e920d958e99fb4edf065a6713c30f2c2a9 (diff) | |
| parent | 1ef9e8376466bb1e2c147e47554b94cab9c8b04a (diff) | |
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 'doc')
| -rw-r--r-- | doc/APIchanges | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 45b38ee24c..4455fbfd4f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -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 |