aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-2510-2247/+2484
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: dsputil: prettyprint gcc inline asm x86: K&R prettyprinting cosmetics for dsputil_mmx.c x86: conditionally compile H.264 QPEL optimizations dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks. Ignore generated files below doc/. dpcm: convert to bytestream2. interplayvideo: convert to bytestream2. movenc: Merge if statements h264: fix memleak in error path. pthread: Immediately release all frames in ff_thread_flush() h264: Add check for invalid chroma_format_idc utvideo: port header reading to bytestream2. Conflicts: .gitignore configure libavcodec/h264_ps.c libavcodec/interplayvideo.c libavcodec/pthread.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | x86: dsputil: prettyprint gcc inline asmDiego Biurrun2012-03-251-1295/+1310
| | |
| * | x86: K&R prettyprinting cosmetics for dsputil_mmx.cDiego Biurrun2012-03-251-773/+1049
| | |
| * | x86: conditionally compile H.264 QPEL optimizationsDiego Biurrun2012-03-253-13/+22
| | |
| * | dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.Diego Biurrun2012-03-251-4/+12
| | | | | | | | | | | | This makes them safe to use in non-fully braced if-blocks and similar.
| * | Ignore generated files below doc/.Diego Biurrun2012-03-251-0/+3
| | |
| * | dpcm: convert to bytestream2.Ronald S. Bultje2012-03-241-27/+31
| | |
| * | interplayvideo: convert to bytestream2.Ronald S. Bultje2012-03-241-199/+124
| | |
| * | movenc: Merge if statementsMartin Storsjö2012-03-251-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | This isn't exactly equivalent with the earlier code for codecs other than H264 and VC1, but those are two only codecs supported by this codepath anyway, and it simplifies it a bit. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | h264: fix memleak in error path.Alexander Strange2012-03-241-1/+1
| | | | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | pthread: Immediately release all frames in ff_thread_flush()Alexander Strange2012-03-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Before this, they were only added to the delayed release queue and not freed until later. This could lead to unnecessary memory use or buffer exhaustion. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | h264: Add check for invalid chroma_format_idcAlexander Strange2012-03-241-1/+5
| | | | | | | | | | | | | | | | | | Fixes a crash when FF_DEBUG_PICT_INFO is used. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | utvideo: port header reading to bytestream2.Ronald S. Bultje2012-03-241-16/+12
| | | | | | | | | | | | | | | | | | | | | Fixes crash during slice size reading if slice_end goes negative. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | | swr-test: test the new flexible bufferingMichael Niedermayer2012-03-251-1/+24
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: realloc_audio: support packed audio buffersMichael Niedermayer2012-03-251-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: More flexible and convenient bufferingMichael Niedermayer2012-03-252-41/+105
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fix SVCD scan_offset optionJulien Ramseier2012-03-251-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | "Metal Gear Solid: The Twin Snakes" demuxerPaul B Mahol2012-03-256-1/+108
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | CrystalHD: Remove EXPERIMENTAL flag for known good formats.Philip Langdale2012-03-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | With the flag in place, it's hard to actually use the decoder, and I'm happy with how it works, with the exception of DivX3 where I've never found a sample that worked that I was confident actually matched what the hardware claimed to support. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | pthread: return proper error code on pthread_create failureMarton Balint2012-03-251-1/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: fix segfault when 0 out size is used.Michael Niedermayer2012-03-251-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: revert stray hunkMichael Niedermayer2012-03-251-5/+0
| | | | | | | | | | | | | | | Found-by:ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | VC1: Do not needlessly use signed types.Reimar Döffinger2012-03-253-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This might even have prevented the compiler from some optimizations, since both signed and unsigned types are used for the dezigzag tables/ table pointers, and if a branches uses both the compiler needs to create more complex code. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | DV: detect another case of broken DV files.Reimar Döffinger2012-03-251-0/+4
| | | | | | | | | | | | | | | | | | | | | See trac issue #217. Only the dsf field seems to be used to distinguish between PAL and NTSC. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | DV: check coded_width/height instead of width/height.Reimar Döffinger2012-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | This makes the workaround also work with lowres. Fixes issue #633. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | vqavideo: fix decoding of samples with no partial updates.Reimar Döffinger2012-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes playback of http://samples.mplayerhq.hu/game-formats/vqa/landsoflore/B0EB8711.VQA (trac issue #710). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | resample: Fix boundary handling with fragments.Michael Niedermayer2012-03-251-4/+4
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: Fix partial flushing.Michael Niedermayer2012-03-251-2/+2
| | | | | | | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: test partial flushingMichael Niedermayer2012-03-251-2/+25
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | mov: fix heap buffer overflowMichael Niedermayer2012-03-251-1/+1
| | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: allow flushing in multiple steps if the output is too small.Michael Niedermayer2012-03-252-11/+15
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-2510-45/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avc: Add a function for converting mp4 style extradata to annex b pthread: free progress if buffer allocation failed. lavc/avconv: support changing frame sizes in codecs with frame mt. libavformat: Document who sets the AVStream.id field utvideo: mark output picture as keyframe. sunrast: Add support for negative linesize. vp8: fix update_lf_deltas in libavcodec/vp8.c ralf: read Huffman code lengths without GetBitContext Conflicts: ffmpeg.c libavcodec/sunrastenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avc: Add a function for converting mp4 style extradata to annex bMartin Storsjö2012-03-243-24/+42
| | | | | | | | | | | | | | | | | | | | | Make movenc use this function instead of the current custom conversion function. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | pthread: free progress if buffer allocation failed.Ronald S. Bultje2012-03-241-0/+4
| | | | | | | | | | | | | | | | | | | | | Else we run out of progress variables after a few failed buffer allocations. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | lavc/avconv: support changing frame sizes in codecs with frame mt.Ronald S. Bultje2012-03-243-13/+11
| | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * | libavformat: Document who sets the AVStream.id fieldMartin Storsjö2012-03-241-1/+6
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | utvideo: mark output picture as keyframe.Kostya Shishkov2012-03-241-0/+2
| | | | | | | | | | | | Spotted by Антон.
| * | sunrast: Add support for negative linesize.Aneesh Dogra2012-03-241-4/+7
| | | | | | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | vp8: fix update_lf_deltas in libavcodec/vp8.cJanne Salonen2012-03-241-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | lf_delta.ref[i] and lf_delta.mode[i] were incorrectly reset to 0 if specific delta value was not updated. Fixed to keep the previous value if flag indicates that element in question is not updated. Signed-off-by: Janne Salonen <jsalonen@google.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * | ralf: read Huffman code lengths without GetBitContextKostya Shishkov2012-03-241-4/+4
| | | | | | | | | | | | | | | Those descriptions are stored in nibbles, so they are easy to extract. And this way we don't need to pad tables for possible bit reader overreads.
* | | ffmpeg: drop struct from SwrContext.Michael Niedermayer2012-03-251-1/+1
| | | | | | | | | | | | | | | | | | Its a typdef now and doesnt need the struct anymore. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: fix compilation failure with old versions of gcc.Michael Niedermayer2012-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | gcc 4.4 did not like the way i used typedefs Idea-by: beastd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | libaacplus: switch to encode2()Paul B Mahol2012-03-241-16/+24
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: drop SWR_CH_MAX with the next major ABI bumpMichael Niedermayer2012-03-241-0/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: dont use SWR_CH_MAX in the public function declaration.Michael Niedermayer2012-03-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This change should make no binary difference to the generated code. the API version is just bumped for correctness sake, this is not really a API or ABI change. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swr: make SwrContext a typedef.Michael Niedermayer2012-03-241-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swresample: support up to 32 channelsMichael Niedermayer2012-03-241-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | adxenc: fix error in merging from qatarPaul B Mahol2012-03-241-3/+2
| | | | | | | | | | | | | | | | | | | | | Pointed out by FATE. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | sonic: mark as experimentalPaul B Mahol2012-03-241-1/+3
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | indeo5dec: Make sure we have had a valid gop header.Michael Niedermayer2012-03-241-1/+5
| | | | | | | | | | | | | | | | | | | | | This prevents decoding happening on a half initialized context. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>