* qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c
Showing the changes to doc/APIchanges (1 of 45 files). Show all
Unified · Split
| @@ -30,6 +30,10 @@ API changes, most recent first: · 29 unmodified lines | |||
| 30 | 2011-05-XX - XXXXXX - lavfi 2.6.0 - avcodec.h | 30 | 2011-05-XX - XXXXXX - lavfi 2.6.0 - avcodec.h |
| 31 | Add avfilter_get_video_buffer_ref_from_frame() to libavfilter/avcodec.h. | 31 | Add avfilter_get_video_buffer_ref_from_frame() to libavfilter/avcodec.h. |
| 32 | 32 | ||
| 33 | 2011-05-28 - 0420bd7 - lavu 51.2.0 - pixdesc.h | ||
| 34 | Add av_get_pix_fmt_name() in libavutil/pixdesc.h, and deprecate | ||
| 35 | avcodec_get_pix_fmt_name() in libavcodec/avcodec.h in its favor. | ||
| 36 | |||
| 33 | 2011-05-25 - 30315a8 - lavf 53.1.0 - avformat.h | 37 | 2011-05-25 - 30315a8 - lavf 53.1.0 - avformat.h |
| 34 | Add fps_probe_size to AVFormatContext. | 38 | Add fps_probe_size to AVFormatContext. |
| 35 | 39 | ||