* 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
Showing the changes to doc/APIchanges (1 of 15 files). Show all
Unified · Split
| @@ -13,7 +13,6 @@ libavutil: 2011-04-18 · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | API changes, most recent first: |
| 15 | 15 | |
| 16 | −<<<<<<< HEAD | |
| 17 | 16 | 2012-02-21 - xxxxxxx - lavc 54.4.100 |
| 18 | 17 | Add av_get_pcm_codec() function. |
| 19 | 18 | |
| @@ -36,8 +35,9 @@ API changes, most recent first: · 16 unmodified lines | ||
| 36 | 35 | 2012-01-24 - xxxxxxx - lavfi 2.60.100 |
| 37 | 36 | Add avfilter_graph_dump. |
| 38 | 37 | |
| 39 | −||||||| merged common ancestors | |
| 40 | −======= | |
| 38 | +2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h | |
| 39 | + Add av_packet_shrink_side_data. | |
| 40 | + | |
| 41 | 41 | 2012-xx-xx - xxxxxxx - lavf 54.2.0 - avformat.h |
| 42 | 42 | Add AVStream.attached_pic and AV_DISPOSITION_ATTACHED_PIC, |
| 43 | 43 | used for dealing with attached pictures/cover art. |