* qatar/master: (27 commits) cmdutils: use new avcodec_is_decoder/encoder() functions. lavc: make codec_is_decoder/encoder() public. lavc: deprecate AVCodecContext.sub_id. libcdio: add a forgotten AVClass to the private context. swscale: remove "cpu flags" from -sws_flags description. proresenc: give user a possibility to alter some encoding parameters vorbisenc: add output buffer overwrite protection libopencore-amrnbenc: fix end-of-stream handling ra144enc: fix end-of-stream handling nellymoserenc: zero any leftover packet bytes nellymoserenc: use proper MDCT overlap delay qpeg: Use bytestream2 functions to prevent buffer overreads. swscale: make %rep unconditional. vp8: convert simple loopfilter x86 assembly to use named arguments. vp8: convert idct x86 assembly to use named arguments. vp8: convert mc x86 assembly to use named arguments. vp8: convert loopfilter x86 assembly to use cpuflags(). vp8: convert idct/mc x86 assembly to use cpuflags(). swscale: remove now unnecessary hack. x86inc: don't "bake" stack_offset in named arguments. ... Conflicts: cmdutils.c doc/APIchanges libavcodec/mpeg12.c libavcodec/options.c libavcodec/qpeg.c libavcodec/utils.c libavcodec/version.h libavdevice/libcdio.c tests/lavf-regression.sh
Showing the changes to doc/APIchanges (1 of 29 files). Show all
Unified · Split
| @@ -35,6 +35,9 @@ API changes, most recent first: · 34 unmodified lines | ||
| 35 | 35 | 2012-01-24 - xxxxxxx - lavfi 2.60.100 |
| 36 | 36 | Add avfilter_graph_dump. |
| 37 | 37 | |
| 38 | +2012-03-xx - xxxxxxx - lavc 54.7.0 - avcodec.h | |
| 39 | + Add av_codec_is_encoder/decoder(). | |
| 40 | + | |
| 38 | 41 | 2012-xx-xx - xxxxxxx - lavc 54.3.0 - avcodec.h |
| 39 | 42 | Add av_packet_shrink_side_data. |
| 40 | 43 | |
| @@ -42,7 +45,6 @@ API changes, most recent first: · 1 unmodified line | ||
| 42 | 45 | Add AVStream.attached_pic and AV_DISPOSITION_ATTACHED_PIC, |
| 43 | 46 | used for dealing with attached pictures/cover art. |
| 44 | 47 | |
| 45 | −>>>>>>> qatar/master | |
| 46 | 48 | 2012-02-25 - c9bca80 - lavu 51.24.0 - error.h |
| 47 | 49 | Add AVERROR_UNKNOWN |
| 48 | 50 | |