summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'Michael Niedermayer2012-11-286-83/+73
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563': vble: Do not abort decoding when version is not 1 lavr: do not pass consumed samples as a parameter to ff_audio_resample() lavr: correct the documentation for the ff_audio_resample() return value lavr: do not pass sample count as a parameter to ff_audio_convert() x86: h264_weight: port to cpuflags configure: Enable avconv filter dependencies automatically Conflicts: configure libavcodec/x86/h264_weight.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vble: Do not abort decoding when version is not 1Piotr Bandurski2012-11-271-4/+2
| | | | | | | | | | | | | | | | Some combinations of OS, VirtualDub, and VBLE can accidentally set the version to a value other than 1. Since no other version of VBLE was ever released, simply warn about it. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavr: do not pass consumed samples as a parameter to ff_audio_resample()Justin Ruggles2012-11-273-10/+6
| | | | | | | | | | Since the resampler handles buffering of unconsumed samples internally, the caller does not need this information.
| * lavr: correct the documentation for the ff_audio_resample() return valueJustin Ruggles2012-11-271-1/+1
| |
| * lavr: do not pass sample count as a parameter to ff_audio_convert()Justin Ruggles2012-11-273-8/+11
| | | | | | | | | | It will always be the number of samples in the input buffer, so just use that directly instead of passing it as a separate parameter.
| * x86: h264_weight: port to cpuflagsDiego Biurrun2012-11-271-57/+48
| |
| * configure: Enable avconv filter dependencies automaticallyMartin Storsjö2012-11-271-3/+3
| | | | | | | | | | | | | | | | | | This makes sure minimal configurations such as "--disable-everything --enable-avconv" will enable the filters necessary for running avconv, instead of just keeping avconv disabled (even if the user specified "--enable-avconv"). Signed-off-by: Martin Storsjö <martin@martin.st>
* | avrdec: sample rate takes 3 bytes not 4Paul B Mahol2012-11-281-1/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avrdec: fix typo in .long_namePaul B Mahol2012-11-281-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | qpeg: reset palette on seeksMichael Niedermayer2012-11-281-0/+15
| | | | | | | | | | | | Fixes Ticket1921 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nut: put nut PCM audio tags in front of avi tags.Michael Niedermayer2012-11-288-14/+18
| | | | | | | | | | | | | | | | This fixes correctly storing and identifying PCM in nut. Based on patch by Luca Barbato Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: add ffmpeg-protocols.texi manualStefano Sabatini2012-11-273-2/+39
| |
* | doc: move syntax and eval chapters from libavutil to ffmpeg-utilsStefano Sabatini2012-11-273-5/+40
| | | | | | | | | | Move utilities description to a dedicated manual, consistent with what I did with the rest of the documentation.
* | doc: add libavdevice.texi and ffmpeg-devices.texi filesStefano Sabatini2012-11-273-1/+97
| |
* | doc: add libavformat.texi and ffmpeg-formats.texi filesStefano Sabatini2012-11-273-1/+203
| |
* | lavfi/drawtext: add support to expansion of generic expressionsStefano Sabatini2012-11-273-1/+33
| |
* | mjpegdec: dont set got_picture to 0 per frame.Michael Niedermayer2012-11-271-1/+0
| | | | | | | | | | | | Fixes Ticket1915 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: reset got_picture on errors, successful return, init and flush.Michael Niedermayer2012-11-271-0/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: replace returns by goto fail in frame decode.Michael Niedermayer2012-11-271-7/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: make sure ret is set before its used.Michael Niedermayer2012-11-271-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add ADPCM IMA Dialogic OKI decoder testPaul B Mahol2012-11-272-0/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | h264: support invalid annex B in mp4Michael Niedermayer2012-11-271-0/+7
| | | | | | | | | | | | Fixes Ticket1914 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver remove CONFIG_NOCUTILS checkMichael Niedermayer2012-11-271-1/+1
| | | | | | | | | | | | | | Nothing sets CONFIG_NOCUTILS, i also dont remember anything setting it in the past. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-272-2/+3
|\ \ | |/ | | | | | | | | | | * qatar/master: h264: set Picture.owner2 to the current thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: set Picture.owner2 to the current threadJanne Grunau2012-11-272-2/+3
| | | | | | | | | | | | | | | | This does not seem to have an effect currently. Fate-h264 passes with THREADS=1..16 and both threading types as before. It fixes however a segfault during error resilience with my adaptive-frame-mt patchset. A picture in use during error resilience gets realloced in another thread in the fuzzed sample sample_varPAR.avi_s226019.
* | Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'Michael Niedermayer2012-11-273-6/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8': h264: check ref_count validity for num_ref_idx_active_override_flag h264: add missing new line to log message dcadec: skip QMF on unused channels wavenc: write fact chunk sample count at the correct file position riff: do not add empty metadata tags in INFO chunk Conflicts: libavcodec/dcadec.c libavcodec/h264.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: check ref_count validity for num_ref_idx_active_override_flagJanne Grunau2012-11-271-1/+6
| | | | | | | | | | | | Fixes segfault in the fuzzed sample bipbop234.ts_s226407. CC: libav-stable@libav.org
| * h264: add missing new line to log messageJanne Grunau2012-11-271-1/+1
| |
| * dcadec: skip QMF on unused channelsMichael Niedermayer2012-11-261-3/+4
| | | | | | | | | | | | | | | | | | | | When the extra rear channel is present but unused, the s->channel_order_tab[] value for that channel is -1. The QMF can be skipped for the extra channel, and doing so avoids an out-of-array read on s->samples_chanptr[]. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * wavenc: write fact chunk sample count at the correct file positionMichael Niedermayer2012-11-261-4/+5
| | | | | | | | | | | | | | Fixes curruption of metadata in the INFO chunk. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * riff: do not add empty metadata tags in INFO chunkJustin Ruggles2012-11-261-0/+6
| |
* | Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'Michael Niedermayer2012-11-274-28/+57
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9': riff: only warn on a bad INFO chunk code size instead of failing configure: Add separate list for libraries and use where appropriate x86: float_dsp: add SSE version of vector_fmul_scalar() Conflicts: configure libavformat/riff.c libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: only warn on a bad INFO chunk code size instead of failingJustin Ruggles2012-11-261-4/+5
| | | | | | | | fixes Bug 392
| * configure: Add separate list for libraries and use where appropriateDiego Biurrun2012-11-261-26/+21
| |
| * x86: float_dsp: add SSE version of vector_fmul_scalar()Justin Ruggles2012-11-262-0/+33
| |
* | Merge commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b'Michael Niedermayer2012-11-2712-84/+95
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '284ea790d89441fa1e6b2d72d3c1ed6d61972f0b': dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil aacenc: use the correct output buffer aacdec: fix signed overflows in lcg_random() base64: fix signed overflow in shift Conflicts: libavcodec/dsputil.c libavutil/base64.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutilJustin Ruggles2012-11-2612-83/+93
| |
| * aacenc: use the correct output bufferMichael Niedermayer2012-11-261-5/+5
| | | | | | | | | | | | | | This fixes segfault caused by 3d3cf6745e2a5dc9c377244454c3186d75b177fa when SingleChannelElement.ret was renamed to SingleChannelElement.ret_buf. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * aacdec: fix signed overflows in lcg_random()Mans Rullgard2012-11-261-1/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * base64: fix signed overflow in shiftMans Rullgard2012-11-261-2/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | file: fix 10l error in access() checkMichael Niedermayer2012-11-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AFC demuxerPaul B Mahol2012-11-276-3/+103
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | astdec: improve probingPaul B Mahol2012-11-271-2/+5
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/overlay: enable yuva420p as overlay backgroundMark Himsley2012-11-272-11/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same calculation as for RGBA etc to create unpremultiplied output. Useful for creating an intermediate "Mix/Effects bank", in vision mixer (switcher) terminology. Example command: ffmpeg -i input.mov -vf "[in]scale=iw:ih:interl=1,format=yuv420p[bg];movie=BBC_blocks_watermark.png,scale=iw:ih:interl=1,format=yuva420p[dog];movie=Kickabout_strap.mov,scale=iw:ih:interl=1,format=yuva420p[strap];[strap][dog]overlay=0:0[me1];[bg][me1]overlay=0:0,scale=0:0:interl=1[out]" -b:v 3M -an output.mov Fix trac ticket #549. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | cafdec: fix seeking with adpcmMichael Niedermayer2012-11-271-1/+1
| | | | | | | | | | | | Fixes Ticket1906 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | file: Fallback to stat() based file_check() when access() or its named flags ↵Michael Niedermayer2012-11-271-0/+10
| | | | | | | | | | | | | | | | | | | | are unavailable. Should fix compilation on native windows We could also use _access() and literal numbers as flags but i cant test it and the compilation failure should be fixed ASAP Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: check for access()Michael Niedermayer2012-11-271-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | file: fix file_check()Michael Niedermayer2012-11-271-7/+8
| | | | | | | | | | | | | | | | | | | | | | Fixes Ticket1904 This should work on windows, but if not please contact me ASAP i have another idea on how to solve this without access() if that really doesnt work on windows. Strongly based on patch by divVerent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | get_dc: fix roundingMichael Niedermayer2012-11-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_aresample: consistently use ROUNDED_DIVMichael Niedermayer2012-11-261-1/+2
| | | | | | | | | | | | This fixes issues with negative timestamps Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud