summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 4xm: check for invalid zero ac coeffsMichael Niedermayer2013-06-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mjpeg_decode_dc: check code before using it in get_xbits()Michael Niedermayer2013-06-30
| | | | | | Fixes undefined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Don't include colorspace.hDerek Buitenhuis2013-06-29
| | | | | | | The header is private, and ffmpeg.c doesn't use it for anything. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* get_pix_fmt_score: favor equal formats if all else equalMichael Niedermayer2013-06-29
| | | | | | Fixes Ticket2578 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* update all trac links to use the trac subdomainMichael Niedermayer2013-06-29
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-29
|\ | | | | | | | | | | | | * cehoyos/master: Avoid a null pointer dereference on clean-up after oom in ac3 encoder. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Avoid a null pointer dereference on clean-up after oom in ac3 encoder.Carl Eugen Hoyos2013-06-29
| |
* | Added codec ID to playback DNxHDReuben Martin2013-06-29
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Avoid a null pointer dereference on oom when decoding smacker.Carl Eugen Hoyos2013-06-29
| | | | Fixes ticket #2728.
* Propagate error return values from the smacker decoder.Carl Eugen Hoyos2013-06-29
|
* Avoid a null pointer dereference on oom when decoding vc1.Carl Eugen Hoyos2013-06-29
| | | | Fixes ticket #2723.
* doc/muxers: apply various minor fixes to segment documentationStefano Sabatini2013-06-29
|
* doc/muxers: sort muxers by nameStefano Sabatini2013-06-29
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wmapro: check num_vec_coeffs against the actual available buffer Conflicts: libavcodec/wmaprodec.c The check is replaced by an assert. See: b21ba20cc83c80fe56192fee3626a8087f37d806 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmapro: check num_vec_coeffs against the actual available bufferLuca Barbato2013-06-28
| | | | | | | | | | | | | | Prevent yet another buffer overwrite. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'Michael Niedermayer2013-06-29
|\| | | | | | | | | | | | | * commit '6652338f43ef623045912d7f28b61adea05d27ae': wmapro: return early on unsupported condition Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmapro: return early on unsupported conditionLuca Barbato2013-06-28
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'Michael Niedermayer2013-06-29
|\| | | | | | | | | | | | | | | | | | | * commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea': wmapro: make sure there is room to store the current packet The check is replaced by an assert as it is impossible to occur See: 780d45473c32fa356c8ce385c3ea4692567c3228 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmapro: make sure there is room to store the current packetLuca Barbato2013-06-28
| | | | | | | | | | | | | | Prevent horrid and hard to trace struct overwrite. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'Michael Niedermayer2013-06-29
|\| | | | | | | | | | | | | * commit 'afe03092dd693d025d43e1620283d8d285c92772': lavc: move put_bits_left in put_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move put_bits_left in put_bits.hLuca Barbato2013-06-28
| |
* | avformat: make av_register_*put_format() thread safeMichael Niedermayer2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/bitstream_filter: make av_register_bitstream_filter() thread safeMichael Niedermayer2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/parser: Make av_register_codec_parser() thread safeMichael Niedermayer2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Make av_register_hwaccel() and avcodec_register() thread safeMichael Niedermayer2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cosmetics: Fix "dont" "wont" "doesnt" typosTimothy Gu2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flac_parser.c: fix case when final frame is a false positiveMichael Chinen2013-06-29
| | | | | | | | | | | | | | Should fix https://ffmpeg.org/trac/ffmpeg/ticket/2552 Only did minimal testing on a few files and fate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: Fix receiving large udp packetsMichael Niedermayer2013-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tak_parser: properly mark packets as key framesPaul B Mahol2013-06-28
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Do not list libshine like a main option in configure's output.Carl Eugen Hoyos2013-06-28
| | | | | | | | It is listed as an enabled external library if applicable.
* | doc/decoders: document libopus decoderTimothy Gu2013-06-28
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc/encoders: alphabetically list the encodersTimothy Gu2013-06-28
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avfilter/avfilter: Make avfilter_register() thread safeMichael Niedermayer2013-06-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-06-28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Avoid a null pointer dereference in avcodec_decode_video2(). Set block_align when reading QDM2 in mov. Fix muxing QDM2 mono into caf. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Avoid a null pointer dereference in avcodec_decode_video2().Carl Eugen Hoyos2013-06-28
| | | | | | | | | | | | | | | This could happen if oom occured while probing a file. Reported in ticket #1900.
| * | Set block_align when reading QDM2 in mov.Carl Eugen Hoyos2013-06-28
| | | | | | | | | | | | Fixes ticket #2718.
| * | Fix muxing QDM2 mono into caf.Carl Eugen Hoyos2013-06-28
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-06-28
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * qatar/master: aac: return meaningful errors Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | aac: return meaningful errorsLuca Barbato2013-06-27
| | |
* | | Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'Michael Niedermayer2013-06-28
|\| | | |/ |/| | | | | | | | | | | | | | | * commit '6d8629aac13692447b54eac795bf74007ebf8987': aac: K&R formatting cosmetics Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: K&R formatting cosmeticsLuca Barbato2013-06-27
| |
* | avfilter/vf_mp: preserve pixel format when possibleMichael Niedermayer2013-06-28
| | | | | | | | | | | | Fixes Ticket2577 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gxf: Added codec ID to playback AVCHDReuben Martin2013-06-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()Stefano Sabatini2013-06-27
| | | | | | | | Also improve error feedback while at it.
* | Added GXF format code to identify AVC Intra video streams. This was an ↵Reuben Martin2013-06-27
| | | | | | | | | | | | extension to the origional GXF spec implemented by Grass Valley. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gxf: Factorize code in get_sindex()Reuben Martin2013-06-27
| | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gxf: Added GXF format code 25 which is used for DV codec in HD resolutionsReuben Martin2013-06-27
| | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix copying extradata to codec in mxfdec.cNigel Touati-Evans2013-06-27
| | | | | | | | | | | | | | | | The code that copies any extradata from the MXFDescriptor to the codec does not set the size, which it should otherwise the copied data is useless. Attached it a patch to correct this. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-06-27
|\ \ | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: simplify and fix flushing out old subtitles on seeking Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: simplify and fix flushing out old subtitles on seekingMarton Balint2013-06-26
| | | | | | | | | | | | | | | | | | Fixes the additional issue reported in ticket #2666. Signed-off-by: Marton Balint <cus@passwd.hu>