* qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores
Showing the changes to doc/APIchanges (1 of 64 files). Show all
Unified · Split
| @@ -13,6 +13,7 @@ libavutil: 2011-04-18 · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | API changes, most recent first: |
| 15 | 15 | |
| 16 | +<<<<<<< HEAD | |
| 16 | 17 | 2012-02-21 - xxxxxxx - lavc 54.4.100 |
| 17 | 18 | Add av_get_pcm_codec() function. |
| 18 | 19 | |
| @@ -35,6 +36,13 @@ API changes, most recent first: · 16 unmodified lines | ||
| 35 | 36 | 2012-01-24 - xxxxxxx - lavfi 2.60.100 |
| 36 | 37 | Add avfilter_graph_dump. |
| 37 | 38 | |
| 39 | +||||||| merged common ancestors | |
| 40 | +======= | |
| 41 | +2012-xx-xx - xxxxxxx - lavf 54.2.0 - avformat.h | |
| 42 | + Add AVStream.attached_pic and AV_DISPOSITION_ATTACHED_PIC, | |
| 43 | + used for dealing with attached pictures/cover art. | |
| 44 | + | |
| 45 | +>>>>>>> qatar/master | |
| 38 | 46 | 2012-02-25 - c9bca80 - lavu 51.24.0 - error.h |
| 39 | 47 | Add AVERROR_UNKNOWN |
| 40 | 48 | |