aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-2312-730/+740
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * dnxhddec: avoid a branch in 10-bit decode_dct_block()Mans Rullgard2011-07-221-1/+1
| | | | | | | | | | | | | | The minimum weight value is 32 so this test can be skipped for the 10-bit case. Overall speedup 3-4%. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * H.264: Add optimizations to predict x86 assembly.Daniel Kang2011-07-223-714/+437
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * riff: Add mpgv MPEG-2 fourccAlex Converse2011-07-221-0/+1
| | | | | | | | Supported by mplayer and seen in the wild.
| * add Flash Screen Video 2 decoderKostya Shishkov2011-07-227-13/+301
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | vf_mp: remove blackframe filter wrapperStefano Sabatini2011-07-235-153/+1
| | | | | | | | blackframe is integrated as a native filter.
* | examples/encoding.c: adopt a less restrictive licenseStefano Sabatini2011-07-231-13/+15
| | | | | | | | | | | | | | Adopt ISC (Internet Systems Consortium) license in place of LGPL, consistent with the other examples. Fabrice explicitely approved the relicensing.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-2246-774/+1294
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: optimise dnxhd_decode_dct_block() rtp: remove disabled code eac3enc: use different numbers of blocks per frame to allow higher bitrates dnxhd: add regression test for 10-bit dnxhd: 10-bit support dsputil: update per-arch init funcs for non-h264 high bit depth dsputil: template get_pixels() for different bit depths dsputil: create 16/32-bit dctcoef versions of some functions jfdctint: add 10-bit version mov: add clcp type track as Subtitle stream. mpeg4: add Mpeg4 Profiles names. mpeg4: decode Level Profile for MPEG4 Part 2. ffprobe: display bitstream level. imgconvert: remove unused glue and xglue macros Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dnxhddec: optimise dnxhd_decode_dct_block()Mans Rullgard2011-07-211-37/+67
| | | | | | | | | | | | | | | | | | Template the function for 8/10-bit and use lowlevel bitstream macros. 6% faster overall on i7 gcc 4.5. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * rtp: remove disabled codeDiego Biurrun2011-07-212-39/+0
| |
| * eac3enc: use different numbers of blocks per frame to allow higher bitratesJustin Ruggles2011-07-216-97/+142
| |
| * dnxhd: add regression test for 10-bitMans Rullgard2011-07-213-0/+13
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dnxhd: 10-bit supportJoseph Artsimovich2011-07-216-81/+427
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: update per-arch init funcs for non-h264 high bit depthMans Rullgard2011-07-2115-15/+15
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: template get_pixels() for different bit depthsMans Rullgard2011-07-219-30/+39
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: create 16/32-bit dctcoef versions of some functionsMans Rullgard2011-07-214-56/+80
| | | | | | | | | | | | | | | | | | | | High bitdepth H.264 needs 32-bit transform coefficients, whereas dnxhd does not. This creates a conflict with the templated functions operating on DCTELEM data. This patch adds a field allowing the caller to choose the element size in dsputil_init() and adds the required functions. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * jfdctint: add 10-bit versionMans Rullgard2011-07-219-416/+454
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mov: add clcp type track as Subtitle stream.Thierry Foucu2011-07-211-1/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * mpeg4: add Mpeg4 Profiles names.Thierry Foucu2011-07-212-0/+37
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * mpeg4: decode Level Profile for MPEG4 Part 2.Thierry Foucu2011-07-211-0/+19
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * ffprobe: display bitstream level.Thierry Foucu2011-07-211-0/+1
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * imgconvert: remove unused glue and xglue macrosStefano Sabatini2011-07-211-3/+0
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | version.sh: handle shallow clones and snapshots.Nicolas George2011-07-221-0/+20
| | | | | | | | | | | | | | | | | | | | Shallow clones (--depth X) lack the N tag used to compute the revision number: use 'git-YYYY-MM-DD-hhhhhhh' as revision, where hhhhhhh is the short git hash. Snapshots from gitweb do not have git information at all, but they have the short git hash in the directory name: append it to the release number.
* | h264: fix h264-testMichael Niedermayer2011-07-211-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-2132-1322/+435
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv30: return AVERROR(EINVAL) instead of EINVAL build: add -L flags before existing LDFLAGS simple_idct: whitespace cosmetics simple_idct: make repeated code a macro dsputil: remove huge #if 0 block simple_idct: change 10-bit add/put stride from pixels to bytes dsputil: allow 9/10-bit functions for non-h264 codecs dnxhd: rename some data tables dnxhdenc: remove inline from function only called through pointer dnxhdenc: whitespace cosmetics swscale: mark YUV422P10(LE,BE) as supported for output configure: add -xc99 to LDFLAGS for Sun CC Remove unused and non-compiling vestigial g729 decoder Remove unused code under G729_BITEXACT #ifdef. mpegvideo: fix invalid picture unreferencing. dsputil: Remove extra blank line at end. dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT. simple_idct: add 10-bit version Conflicts: Makefile libavcodec/g729data.h libavcodec/g729dec.c libavcodec/rv30.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv30: return AVERROR(EINVAL) instead of EINVALDiego Biurrun2011-07-211-1/+1
| | | | | | | | On some platforms EINVAL could be positive, ensure we return negative values.
| * build: add -L flags before existing LDFLAGSMans Rullgard2011-07-211-3/+3
| | | | | | | | | | | | | | | | This ensures the linker picks the just built libraries even if LDFLAGS for some reason contains -L flags pointing at other directories containing libav libraries. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * simple_idct: whitespace cosmeticsMans Rullgard2011-07-211-124/+124
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * simple_idct: make repeated code a macroMans Rullgard2011-07-211-144/+53
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: remove huge #if 0 blockMans Rullgard2011-07-211-145/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * simple_idct: change 10-bit add/put stride from pixels to bytesMans Rullgard2011-07-211-0/+6
| | | | | | | | | | | | This matches other dsputil functions and simplifies calls. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dsputil: allow 9/10-bit functions for non-h264 codecsMans Rullgard2011-07-211-15/+12
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dnxhd: rename some data tablesJoseph Artsimovich2011-07-211-16/+16
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dnxhdenc: remove inline from function only called through pointerMans Rullgard2011-07-211-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dnxhdenc: whitespace cosmeticsMans Rullgard2011-07-211-30/+32
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * swscale: mark YUV422P10(LE,BE) as supported for outputJoseph Artsimovich2011-07-216-0/+12
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * configure: add -xc99 to LDFLAGS for Sun CCSean McGovern2011-07-211-0/+1
| | | | | | | | | | | | | | Using Sun's compiler on Solaris, -xc99 is as much a linker flag as a compiler flag, so add it to LDFLAGS. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Remove unused and non-compiling vestigial g729 decoderDiego Biurrun2011-07-205-661/+1
| |
| * Remove unused code under G729_BITEXACT #ifdef.Diego Biurrun2011-07-203-100/+0
| | | | | | | | G729_BITEXACT is never set, so the code is all dead code.
| * mpegvideo: fix invalid picture unreferencing.Ronald S. Bultje2011-07-201-4/+6
| | | | | | | | | | | | | | | | | | | | | | Mpegvideo would free frames as soon as they're not the next or prev picture. This is fine for a single-threading model, but fails miserably in a system where pictures can be referenced (as e.g. last/prev pic) in other threads. Keeping track of ownership of pictures keeps image references (e.g. motion vectors, or the reference of a motion vector) alive as long as the picture data itself is alive. This also happens to fix make THREADS=[3-16] fate-vsynth[12]-error.
| * dsputil: Remove extra blank line at end.Alex Converse2011-07-201-1/+0
| |
| * dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.Alex Converse2011-07-201-1/+1
| |
| * simple_idct: add 10-bit versionMans Rullgard2011-07-2017-361/+461
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | vf_mp: remove cropdetect wrapperStefano Sabatini2011-07-215-206/+1
| | | | | | | | The cropdetect filter is natively integrated into libavfilter.
* | vf_blackframe: port missing features from libmpcodecs blackframeStefano Sabatini2011-07-212-3/+10
| | | | | | | | | | | | Use and show picref->video->pict_type and key_frame information. The pict_type and key_frame information was not available at the time of the port.
* | au: reuse the result of the previous call to av_get_bits_per_sample()Stefano Sabatini2011-07-211-3/+3
| | | | | | | | | | Avoid an unnecessary call to the function, slighlty more robust/readable.
* | libavfilter: fix --enable-smallMichael Niedermayer2011-07-211-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-2014-237/+151
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Remove h264_lowres_idct_put/add functions Remove snow/dwt test program h264: remove some disabled code Fix incorrect max_lowres values matroskadec: fix integer underflow if header length < probe length. cosmetics: indentation eac3enc: use frame exponent strategy when applicable. cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder. dsputil: fix ff_check_alignment() Conflicts: libavcodec/Makefile libavcodec/h264idct_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove h264_lowres_idct_put/add functionsMans Rullgard2011-07-203-59/+25
| | | | | | | | | | | | | | | | Use of these has been broken ever since the h264 idct was changed to always use transposed inputs. Furthermore, they were only ever used if some *other* non-default idct was requested. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove snow/dwt test programMans Rullgard2011-07-202-122/+1
| | | | | | | | | | | | | | This test program so full of programming errors it is impossible to make sense of it. Signed-off-by: Mans Rullgard <mans@mansr.com>