summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | mpeg4videodec: use ROUNDED_DIV for pts calculationMichael Niedermayer2012-11-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | adpcm: thp, afc: support multichannel decodingPaul B Mahol2012-11-261-5/+7
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | h264: Fix minor bug in h264.c error traceSergio Garcia Murillo2012-11-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_aresample: fix rounding of negative timestampsMichael Niedermayer2012-11-261-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-261-1/+4
|\ \ | |/ | | | | | | | | | | * qatar/master: lavf: avoid integer overflow in ff_compute_frame_duration() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: avoid integer overflow in ff_compute_frame_duration()Janne Grunau2012-11-261-1/+4
| | | | | | | | | | | | | | | | Scaling the denominator instead of the numerator if it is too large loses precision. Fixes an assert caused by a negative frame duration in the fuzzed sample nasa-8s2.ts_s202310. CC: libav-stable@libav.org
* | Merge commit '5ae72f54532960cb9eae82a1c9e8d505106c022b'Michael Niedermayer2012-11-263-19/+36
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '5ae72f54532960cb9eae82a1c9e8d505106c022b': flashsv: check for keyframe before using differential coding h264: enable low delay only if no delayed frames were seen x86: fix build without inline asm Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flashsv: check for keyframe before using differential codingJanne Grunau2012-11-261-0/+5
| | | | | | | | | | | | Fixes a segfault in te fuzzed sample resolutionchange.flv_s211713. CC: libav-stable@libav.org
| * h264: enable low delay only if no delayed frames were seenJanne Grunau2012-11-261-2/+8
| | | | | | | | | | | | | | | | | | | | | | Dropping frames is undesirable but that is the only way by which the decoder could return to low delay mode. Instead emit a warning and continue with delayed frames. Fixes a crash in fuzzed sample nasa-8s2.ts_s20033 caused by a larger than expected has_b_frames value. Low delay keeps getting re-enabled from a presumely broken SPS. CC: libav-stable@libav.org
| * x86: fix build without inline asmDiego Biurrun2012-11-261-20/+22
| | | | | | | | | | | | | | | | The qpel functions referenced here are not related to h264 and should thus never have been under CONFIG_H264QPEL. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'Michael Niedermayer2012-11-264-56/+76
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa': aacdec: use float planar sample format for output Conflicts: libavcodec/aacdec.c libavcodec/aacsbr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: use float planar sample format for outputJustin Ruggles2012-11-253-48/+66
| |
* | Merge commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c'Michael Niedermayer2012-11-264-55/+73
|\ \ | |/ | | | | | | | | | | | | | | * commit '8e134e5104e99a69cd4cea10540a7ce9c3682a2c': lavc: clarify get_buffer() documentation mpegaudiodec: use planar sample format for output unless packed is requested x86: h264 qpel: use the correct number of utilized xmm regs in cglobal Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: clarify get_buffer() documentationJustin Ruggles2012-11-251-1/+6
| | | | | | | | | | This is needed for the AAC decoder, which may need to call get_buffer() more than once if the channel configuration changes.
| * mpegaudiodec: use planar sample format for output unless packed is requestedJustin Ruggles2012-11-252-48/+61
| |
| * x86: h264 qpel: use the correct number of utilized xmm regs in cglobalJustin Ruggles2012-11-251-6/+6
| | | | | | | | Fixes xmm register clobbering on win64.
* | dsputil_mmx: ff_put_dirac_pixels depend now on yasm.Michael Niedermayer2012-11-261-0/+2
| | | | | | | | | | | | Fix compile failure without yasm Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | iff demuxer: don't bother checking bitmap compression type; iff decoder does ↵Peter Ross2012-11-261-24/+2
| | | | | | | | | | | | | | this now Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com>
* | iff decoder: reindentPeter Ross2012-11-261-132/+132
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | iff decoder: merge iff ilbm and byterun1 decodersPeter Ross2012-11-261-105/+82
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com>
* | dpx: perform width/height upgrade and av_image_check_size earlier to prevent ↵Peter Ross2012-11-261-4/+5
| | | | | | | | | | | | segfault on malformed input Signed-off-by: Peter Ross <pross@xvid.org>
* | av_get_audio_frame_duration: add ADPCM_AFCPaul B Mahol2012-11-261-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/general: improve AST descriptionPaul B Mahol2012-11-261-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg: fix swr filter_type for auto inserted aresample filtersMichael Niedermayer2012-11-263-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix passing swresample options to the auto inserted swrMichael Niedermayer2012-11-261-0/+10
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfiltergraph: add aresample_swr_optsMichael Niedermayer2012-11-262-1/+5
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: drop time redefinition as it causes some problems in some uncommon ↵Michael Niedermayer2012-11-261-2/+0
| | | | | | | | | | | | | | configurations. Based-on: e96d90eed66a198566c409958432d282e1b03869 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-266-1204/+1282
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: remove #defines to prevent use of discouraged external functions x86: h264: Convert 8-bit QPEL inline assembly to YASM Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * remove #defines to prevent use of discouraged external functionsJanne Grunau2012-11-251-34/+0
| | | | | | | | | | | | | | | | | | | | | | Preventing the use of discouraged or 'insecure' external functions through defines in an internal header is not a good solution. The header is not guaranteed to be included universally which makes overlooking bad use of said functions during review more likely. There are cases were those functions either are the most straight forward solution or even have to be used. Using malloc or free is required if the allocation or release is done by other libraries.
| * x86: h264: Convert 8-bit QPEL inline assembly to YASMDaniel Kang2012-11-256-1198/+1276
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | adpcm/thp: make use of ADPCMChannelStatus to store prev samplesPaul B Mahol2012-11-261-8/+8
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96'Michael Niedermayer2012-11-263-158/+14
|\ \ | |/ | | | | | | | | | | * commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96': x86: h264: Remove 3dnow QPEL code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264: Remove 3dnow QPEL codeDaniel Kang2012-11-253-158/+14
| | | | | | | | | | | | | | The only CPUs that have 3dnow and don't have mmxext are 12 years old. Moreover, AMD has dropped 3dnow extensions from newer CPUs. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'Michael Niedermayer2012-11-265-60/+66
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28c8e288fa0342fdef532a7522a4707bebf831cc': x86: h264_chromamc: port to cpuflags yop: fix typo avconv: fix copying per-stream metadata. doc: avtools-common-opts: Fix terminology concerning metric prefixes configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge riff: Make ff_riff_tags static and move under appropriate #ifdef Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264_chromamc: port to cpuflagsDiego Biurrun2012-11-251-41/+44
| |
| * yop: fix typoPaul B Mahol2012-11-251-1/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * avconv: fix copying per-stream metadata.Anton Khirnov2012-11-251-0/+2
| | | | | | | | | | | | | | It is handled separately from other types because it uses stream specifiers and currently that triggers an assert in SET_DICT. CC:libav-stable@libav.org
| * doc: avtools-common-opts: Fix terminology concerning metric prefixesMarcus Stollsteimer2012-11-251-5/+6
| | | | | | | | | | | | | | | | | | 'k', 'M', and 'G' are SI (unit) prefixes or metric prefixes, not 'number postfixes'. Also, the statement regarding binary prefixes ("powers of 2 are used instead of powers of 10") might be misinterpreted (1 kB = 10^3 B, but 1 KiB != 2^3 B). Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * configure: suncc: Add compiler arch support for Nehalem & Sandy BridgeSean McGovern2012-11-251-1/+3
| | | | | | | | | | | | | | | | GCC does not appear to have a -march= string for Westmere, which is a bit surprising as it has a few more instructions than a Nehalem, but a few less than a Sandy Bridge. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * riff: Make ff_riff_tags static and move under appropriate #ifdefDiego Biurrun2012-11-251-11/+11
| | | | | | | | The table is not used outside the file.
* | lavu/samplefmt: return the size of the allocated samples buffer at the next bumpStefano Sabatini2012-11-254-3/+19
| | | | | | | | | | | | | | | | | | | | Make the functions av_samples_fill_arrays, av_samples_alloc, and avcodec_fill_audio_frame return a buffer size rather than 0 in case of success. This will be enabled at the next libavutil major bump, in order to preserve backward compatibility. Returning the size allows to simplify the code, avoiding a few function calls.
* | doc/encoders: add a note for x264 options that use colonIvan Pozdeev2012-11-251-1/+3
| | | | | | | | | | Signed-off-by: Ivan Pozdeev <ivan_pozdeev@mail.ru> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Support switching field order when decoding frwu.Carl Eugen Hoyos2012-11-251-1/+28
| | | | | | | | | | | | | | The binary encoder has a "switch field order" setting that moves one line from the top to the bottom of the frame. Fixes ticket #966.
* | imc: flush decoderMichael Niedermayer2012-11-251-0/+10
| | | | | | | | | | | | | | Fixes Ticket1899 Based on code by ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tga: check palette size earlier.Michael Niedermayer2012-11-251-4/+5
| | | | | | | | | | | | Fixes Ticket1895 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: check return value of avcodec_fill_audio_frame() for < 0Stefano Sabatini2012-11-251-2/+2
| | | | | | | | | | Assume that the value is always negative in case of error, as stated in the docs, do not assume that the value cannot be != 0 in case of success.
* | lavu/opt: add support for reading pixel and sample format through av_get_int()Stefano Sabatini2012-11-252-1/+3
| | | | | | | | | | Simplify backward compatibility, when switching from AV_OPT_TYPE_INT to AV_OPT_TYPE_SAMPLE/PIXEL_FMT.
* | doc: add libswscale.texi and ffmpeg-scaler.texi filesStefano Sabatini2012-11-253-1/+193
| |
* | mpsmpeg4: use av_image_check_sizePeter Ross2012-11-251-5/+4
| | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avrndec: use av_image_check_sizePeter Ross2012-11-251-2/+4
| | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud