summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* ass_split: accept files with only \n and no \r.Nicolas George2012-03-07
| | | | | | The +1 is there to skip the ','. With \r\n, the +1 skips the \r but that is ok. With only \n, the +1 skips it and all hell breaks loose.
* assdec: avoid a possible NULL dereference.Nicolas George2012-03-07
|
* ffv1: PIX_FMT_YUV444P10 supportPaul B Mahol2012-03-07
| | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffv1: PIX_FMT_YUV444P9 & PIX_FMT_YUV422P9 supportPaul B Mahol2012-03-07
| | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Revert "error_resilience: initialize s->block_index[]."Michael Niedermayer2012-03-07
| | | | | | This reverts commit 6193ff68549ecbaf1a4d63a0e06964ec580ac620. This change is unneeded.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-07
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: SBR DSP: fix SSE code to not use SSE2 instructions. cpu: initialize mask to -1, so that by default, optimizations are used. error_resilience: initialize s->block_index[]. svq3: protect against negative quantizers. Don't use ff_cropTbl[] for IDCT. swscale: make filterPos 32bit. FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option. avconv: add -cpuflags option for setting supported cpuflags. cpu: add av_set_cpu_flags_mask(). libx264: Allow overriding the sliced threads option avconv: fix counting encoded video size. Conflicts: doc/APIchanges doc/fate.texi doc/ffmpeg.texi ffmpeg.c libavcodec/h264idct_template.c libavcodec/svq3.c libavutil/avutil.h libavutil/cpu.c libavutil/cpu.h libswscale/swscale.c tests/Makefile tests/fate-run.sh tests/regression-funcs.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * SBR DSP: fix SSE code to not use SSE2 instructions.Reimar Döffinger2012-03-06
| | | | | | | | | | | | | | | | movq from SSE register _to_ memory is an SSE2 instruction. Use the SSE movlps function instead that does the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * error_resilience: initialize s->block_index[].Ronald S. Bultje2012-03-06
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * svq3: protect against negative quantizers.Ronald S. Bultje2012-03-06
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * Don't use ff_cropTbl[] for IDCT.Ronald S. Bultje2012-03-06
| | | | | | | | | | | | | | | | Results of IDCT can by far outreach the range of ff_cropTbl[], leading to overreads and potentially crashes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * libx264: Allow overriding the sliced threads optionMartin Storsjö2012-03-06
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavc/utils: fix const correctness of AVClass castMichael Niedermayer2012-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: remove unused variable from avcodec_encode_video2.Michael Niedermayer2012-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegenc: Fix const correctness and avoid writes into AVFrame of ↵Michael Niedermayer2012-03-07
| | | | | | | | | | | | amv_encode_picture() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264 Fix: "warning: assigning to 'uint8_t *' (aka 'unsigned char *') from ↵Michael Niedermayer2012-03-07
| | | | | | | | | | | | 'const uint8_t *' (aka 'const unsigned char *') discards qualifiers" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: fix warning about "uint8_t *p" and constMichael Niedermayer2012-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cook: silence some signed overflow warnings.Michael Niedermayer2012-03-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacdec: Fix out of array writes (stack).Michael Niedermayer2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue in the code to check the size that will be written to match the actual code writing. In the long term it would make sense to change this so the counting and writing code are the same so they dont need to be kept in sync. It also increases the array size, which was too small either way and adds a redudnant saftey check. This issue does not affect any FFmpeg release as it has been introduced Jan 31 which is narrowly after our last release. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix bink decoder for files with 24px width.Bastien Bouclet2012-03-06
| | | | | | | | Fixes ticket #962.
* | diracdec: Correct the bytestream end pointer.Michael Niedermayer2012-03-06
| | | | | | | | | | | | | | This fixes some arith decoder overreads and a potential infinite loop. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) cdxl demux: do not create packets with uninitialized data at EOF. Replace computations of remaining bits with calls to get_bits_left(). amrnb/amrwb: Remove get_bits usage. cosmetics: reindent avformat: do not require a pixel/sample format if there is no decoder avformat: do not fill-in audio packet duration in compute_pkt_fields() lavf: Use av_get_audio_frame_duration() in get_audio_frame_size() dca_parser: parse the sample rate and frame durations libspeexdec: do not set AVCodecContext.frame_size libopencore-amr: do not set AVCodecContext.frame_size alsdec: do not set AVCodecContext.frame_size siff: do not set AVCodecContext.frame_size amr demuxer: do not set AVCodecContext.frame_size. aiffdec: do not set AVCodecContext.frame_size mov: do not set AVCodecContext.frame_size ape: do not set AVCodecContext.frame_size. rdt: remove workaround for infinite loop with aac avformat: do not require frame_size in avformat_find_stream_info() for CELT avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3 avformat: do not require frame_size in avformat_find_stream_info() for AAC ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/h264.c libavcodec/h264_ps.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace computations of remaining bits with calls to get_bits_left().Alex Converse2012-03-05
| |
| * amrnb/amrwb: Remove get_bits usage.Alex Converse2012-03-05
| | | | | | | | | | It is used to parse fixed sized fields out of a single octet. The code is simpler without it.
| * dca_parser: parse the sample rate and frame durationsJustin Ruggles2012-03-05
| |
| * libspeexdec: do not set AVCodecContext.frame_sizeJustin Ruggles2012-03-05
| | | | | | | | It is not necessary
| * libopencore-amr: do not set AVCodecContext.frame_sizeJustin Ruggles2012-03-05
| | | | | | | | It is not necessary
| * alsdec: do not set AVCodecContext.frame_sizeJustin Ruggles2012-03-05
| | | | | | | | It is not necessary
| * avcodec: add av_get_audio_frame_duration() function.Justin Ruggles2012-03-05
| | | | | | | | | | This is a utility function for the user to get the frame duration based on the codec id, frame size in bytes, and various AVCodecContext parameters.
| * avcodec: add av_get_exact_bits_per_sample() functionJustin Ruggles2012-03-05
| | | | | | | | | | | | This only returns bits per sample when it is exactly correct. That is, the codec contains only raw samples with no frame headers or padding. This applies to basically all PCM codecs and a small subset of ADPCM codecs.
| * Fix format string vulnerability detected by -Wformat-security.Fabian Greffrath2012-03-05
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * x86: clean up ff_dsputil_init_mmx()Mans Rullgard2012-03-05
| | | | | | | | | | | | | | | | This splits ff_dsputil_init_mmx() into multiple functions, one for each MMX/SSE level, somewhat simplifying the nested conditions. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | libutvideo: Add Ut Video encoder wrapperDerek Buitenhuis2012-03-05
| | | | | | | | | | | | | | | | | | All colorspaces are supported. Renamed libutvideo.cpp to libutvideodec.cpp. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libutvideo: Move structs and includes to headerDerek Buitenhuis2012-03-05
| | | | | | | | | | | | | | | | This is so the forthcoming encoder wrapper can share them. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove AV_LOG_DEBUG from av_dlog() calls.Carl Eugen Hoyos2012-03-05
| | | | | | | | AV_LOG_DEBUG is forced by the av_dlog definition.
* | cook: fix return statements.Michael Niedermayer2012-03-05
| | | | | | | | | | Found-by: cbsrobot Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmaenc: change some asserts to av_assert0.Michael Niedermayer2012-03-05
| | | | | | | | | | | | This ensures they are always checked Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmaenc: add assert to check encode_superframe() return.Michael Niedermayer2012-03-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "wmaenc: check final frame size against output packet size"Michael Niedermayer2012-03-05
| | | | | | | | | | | | | | | | This condition cannot happen, if it can it is a bug that MUST be fixed. And i very happily volunteer to fix it if someone reports a case to me that fails. This reverts commit 5d652e063bd3a180f9de8915e5137aa4f938846d.
* | smc: Fix overread.Michael Niedermayer2012-03-05
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bit_depth_template: use av_clip_uint8 over crop_tab.Michael Niedermayer2012-03-05
| | | | | | | | | | | | | | | | | | | | This fixes some global out of array reads and wrong cliping. No speed difference meassurable under clang on i5 also all important code paths on all important platforms should use SIMD. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo3: move MV check up.Michael Niedermayer2012-03-05
| | | | | | | | | | | | | | This adds checking for modes >= 10. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cook: check decouple values.Michael Niedermayer2012-03-05
| | | | | | | | | | | | | | This fixes a out of global array read in the cplscale* tables. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) cmdutils: use new avcodec_is_decoder/encoder() functions. lavc: make codec_is_decoder/encoder() public. lavc: deprecate AVCodecContext.sub_id. libcdio: add a forgotten AVClass to the private context. swscale: remove "cpu flags" from -sws_flags description. proresenc: give user a possibility to alter some encoding parameters vorbisenc: add output buffer overwrite protection libopencore-amrnbenc: fix end-of-stream handling ra144enc: fix end-of-stream handling nellymoserenc: zero any leftover packet bytes nellymoserenc: use proper MDCT overlap delay qpeg: Use bytestream2 functions to prevent buffer overreads. swscale: make %rep unconditional. vp8: convert simple loopfilter x86 assembly to use named arguments. vp8: convert idct x86 assembly to use named arguments. vp8: convert mc x86 assembly to use named arguments. vp8: convert loopfilter x86 assembly to use cpuflags(). vp8: convert idct/mc x86 assembly to use cpuflags(). swscale: remove now unnecessary hack. x86inc: don't "bake" stack_offset in named arguments. ... Conflicts: cmdutils.c doc/APIchanges libavcodec/mpeg12.c libavcodec/options.c libavcodec/qpeg.c libavcodec/utils.c libavcodec/version.h libavdevice/libcdio.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make codec_is_decoder/encoder() public.Anton Khirnov2012-03-04
| |
| * lavc: deprecate AVCodecContext.sub_id.Anton Khirnov2012-03-04
| | | | | | | | | | | | | | In most places where it's used, it's as a pointless write-only field. Only rv10 decoder actually reads from it, but it stores some internal version info in it. There is no reason for it to be in a public field.
| * proresenc: give user a possibility to alter some encoding parametersKostya Shishkov2012-03-04
| | | | | | | | | | This allows user to select quantisation matrix from different profile, stamp frames with custom vendor string and change target bitrate.
| * vorbisenc: add output buffer overwrite protectionJustin Ruggles2012-03-04
| |
| * libopencore-amrnbenc: fix end-of-stream handlingJustin Ruggles2012-03-04
| | | | | | | | | | | | Use CODEC_CAP_DELAY and CODEC_CAP_SMALL_LAST_FRAME to properly pad and flush the encoder at the end of encoding. This is needed in order to have all input samples decoded.
| * ra144enc: fix end-of-stream handlingJustin Ruggles2012-03-04
| | | | | | | | | | | | Use CODEC_CAP_DELAY and CODEC_CAP_SMALL_LAST_FRAME to properly pad and flush the encoder at the end of encoding. This is needed in order to have all input samples decoded.
| * nellymoserenc: zero any leftover packet bytesJustin Ruggles2012-03-04
| | | | | | | | fixes writing of uninitialized packet data