From: Michael Niedermayer Date: Sat, 23 Jul 2011 14:47:10 +0000 (+0200) Subject: Merge remote-tracking branch 'qatar/master' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e;p=ffmpeg Merge remote-tracking branch 'qatar/master' * qatar/master: dnxhddec: avoid a branch in 10-bit decode_dct_block() H.264: Add optimizations to predict x86 assembly. riff: Add mpgv MPEG-2 fourcc add Flash Screen Video 2 decoder Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer --- 5271b857ebc7ddcfa2d0dc6604f55ef43d2bc49e diff --cc Changelog index 470b3020b11,7b8be5b3025..fa5d4fa90eb --- a/Changelog +++ b/Changelog @@@ -1,17 -1,38 +1,18 @@@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. +version next: -version : +- openal input device added +- boxblur filter added - BWF muxer + - Flash Screen Video 2 decoder -version 0.7: - -- E-AC-3 audio encoder -- ac3enc: add channel coupling support -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders -- H.264/MPEG frame-level multithreading -- av_metadata_* functions renamed to av_dict_* and moved to libavutil -- 4:4:4 H.264 decoding support -- 10-bit H.264 optimizations for x86 -- bump libswscale for recently reported ABI break +version 0.8: -version 0.7_beta2: - -- VP8 frame-level multithreading -- NEON optimizations for VP8 -- removed a lot of deprecated API cruft -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors -- DPX image encoder -- SMPTE 302M AES3 audio decoder -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead -- 9bit and 10bit per sample support in the H.264 decoder - - -version 0.7_beta1: - +- many many things we forgot because we rather write code than changelogs - WebM support in Matroska de/muxer - low overhead Ogg muxing - MMS-TCP support diff --cc configure index 5fa1d96eb7f,a83d3396e1b..f72f8f791d3 --- a/configure +++ b/configure @@@ -1279,7 -1270,7 +1279,8 @@@ flac_decoder_select="golomb flac_encoder_select="golomb lpc" flashsv_decoder_select="zlib" flashsv_encoder_select="zlib" +flashsv2_encoder_select="zlib" + flashsv2_decoder_select="zlib" flv_decoder_select="h263_decoder" flv_encoder_select="h263_encoder" fraps_decoder_select="huffman" diff --cc doc/general.texi index bd17f9056fd,c9919390d60..c5045b10953 --- a/doc/general.texi +++ b/doc/general.texi @@@ -401,7 -401,7 +401,7 @@@ following image formats are supported @tab experimental lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X @tab fourcc: FSV1 - @item Flash Screen Video v2 @tab X -@item Flash Screen Video v2 @tab @tab X ++@item Flash Screen Video v2 @tab X @tab X @item Flash Video (FLV) @tab X @tab X @tab Sorenson H.263 used in Flash @item Fraps @tab @tab X diff --cc libavcodec/Makefile index 8b3d35ab388,99ecbbf5671..9706939aece --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@@ -148,11 -142,11 +148,12 @@@ OBJS-$(CONFIG_FFV1_DECODER) OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o -OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o -OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o +OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o vorbis_data.o +OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o vorbis_data.o OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o +OBJS-$(CONFIG_FLASHSV2_ENCODER) += flashsv2enc.o + OBJS-$(CONFIG_FLASHSV2_DECODER) += flashsv.o OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o diff --cc libavcodec/allcodecs.c index e6305cf7d2b,dcef0d6d94c..5480c7e78be --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@@ -109,7 -106,7 +109,7 @@@ void avcodec_register_all(void REGISTER_ENCDEC (FFV1, ffv1); REGISTER_ENCDEC (FFVHUFF, ffvhuff); REGISTER_ENCDEC (FLASHSV, flashsv); - REGISTER_ENCODER (FLASHSV2, flashsv2); - REGISTER_DECODER (FLASHSV2, flashsv2); ++ REGISTER_ENCDEC (FLASHSV2, flashsv2); REGISTER_DECODER (FLIC, flic); REGISTER_ENCDEC (FLV, flv); REGISTER_DECODER (FOURXM, fourxm); diff --cc libavcodec/version.h index 475e748ca71,8d40899557a..1883768a291 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -21,7 -21,7 +21,7 @@@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 53 - #define LIBAVCODEC_VERSION_MINOR 8 -#define LIBAVCODEC_VERSION_MINOR 7 ++#define LIBAVCODEC_VERSION_MINOR 9 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \