diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-01 23:11:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-01 23:11:31 +0100 |
| commit | 1eb7f39c7b8172e02a7c95073036a2c327215db8 (patch) | |
| tree | c3323cf0b704cdc2eda65bb202af3329a8973e2a /doc | |
| parent | 75d11b55d7c6f9417c047500171b8aa42b8b8f50 (diff) | |
| parent | 0ce4fe482c27abfa7eac503a52fdc50b70ccd871 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: error out on invalid bitdepth.
aacsbr: use a swap index for the Y matrix rather than copy buffers.
huffyuv: do not abort on unknown pix_fmt; instead, return an error.
lcl: return negative error codes on decode_init() errors.
rtpenc: Use MB info side data for splitting H263 packets for RFC 2190
h263enc: Add an option for outputting info about MBs as side data
avpacket: Add a function for shrinking already allocated side data
nellymoserdec: Saner and faster IMDCT windowing
Conflicts:
doc/APIchanges
libavcodec/avpacket.c
libavcodec/version.h
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 5818f6a8ec..b579e826c1 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,7 +13,6 @@ libavutil: 2011-04-18 API changes, most recent first: -<<<<<<< HEAD 2012-02-21 - xxxxxxx - lavc 54.4.100 Add av_get_pcm_codec() function. @@ -36,8 +35,9 @@ API changes, most recent first: 2012-01-24 - xxxxxxx - lavfi 2.60.100 Add avfilter_graph_dump. -||||||| merged common ancestors -======= +2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h + Add av_packet_shrink_side_data. + 2012-xx-xx - xxxxxxx - lavf 54.2.0 - avformat.h Add AVStream.attached_pic and AV_DISPOSITION_ATTACHED_PIC, used for dealing with attached pictures/cover art. |