aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: document -v repeatMichael Niedermayer2013-04-041-1/+7
| | | | | Thanks-to: Derek Buitenhuis Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-04-041-0/+8
|\ | | | | | | | | | | | | * cigaes/master: lavc: use packet duration for subtitles if necessary. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use packet duration for subtitles if necessary.Nicolas George2013-04-041-0/+8
| | | | | | | | Fix trac ticket #2397.
* | avutil/opencl: replace assert by check and error message in av_opencl_init()highgod04012013-04-041-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opencl: check strtol for failurehighgod04012013-04-041-2/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opencl: add check for the program number to create kernelhighgod04012013-04-041-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/blend: add N variablePaul B Mahol2013-04-042-2/+7
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/smptebars: fix output for subsampled yuvPaul B Mahol2013-04-041-13/+16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | matroskadec: Check EBML lace sizes.Michael Niedermayer2013-04-041-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Check for overflows in xiph lace decodingMichael Niedermayer2013-04-041-2/+2
| | | | | | | | | | | | This also detects errors earlier Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: fix return code for too long xiph lacesMichael Niedermayer2013-04-041-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dfa: remove redundant checkMichael Niedermayer2013-04-041-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-041-4/+8
|\ \ | | | | | | | | | | | | | | | | | | * qatar/master: xmv: do not leak memory in the error paths in xmv_read_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | xmv: do not leak memory in the error paths in xmv_read_header()Anton Khirnov2013-04-041-4/+8
| | | | | | | | | | | | CC: libav-stable@libav.org
* | | Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'Michael Niedermayer2013-04-042-15/+22
|\| | | |/ |/| | | | | | | | | | | | | | | | | * commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c': xmv: check audio track parameters validity. bmv: check for len being valid in bmv_decode_frame(). Conflicts: libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xmv: check audio track parameters validity.Anton Khirnov2013-04-041-10/+22
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * bmv: check for len being valid in bmv_decode_frame().Anton Khirnov2013-04-041-1/+1
| | | | | | | | | | | | | | | | It can be 0 or -1 for invalid files, which may result in invalid memory access. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'Michael Niedermayer2013-04-042-2/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '8d617b11cfc87b2c6056fee029ac5bc760af874a': id3v2: pad the APIC packets as required by lavc. dfa: check for invalid access in decode_wdlt(). Conflicts: libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: pad the APIC packets as required by lavc.Anton Khirnov2013-04-041-2/+3
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * dfa: check for invalid access in decode_wdlt().Anton Khirnov2013-04-041-0/+2
| | | | | | | | | | | | | | | | This can happen when the number of skipped lines is not consistent with the number of coded lines. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756'Michael Niedermayer2013-04-042-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbb1425811a672eddf4acf0513237cdf20f83756': lavf: make sure stream probe data gets freed. avfiltergraph: set deprecated filter_count. Conflicts: libavformat/utils.c See: 44a7a6300d104dd453bcd5c601e9c6944fb34679 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make sure stream probe data gets freed.Anton Khirnov2013-04-041-0/+1
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * avfiltergraph: set deprecated filter_count.Anton Khirnov2013-04-041-0/+4
| |
* | Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b'Michael Niedermayer2013-04-043-4/+12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'bcc94328980e6c56546792ab08b0756abdce310b': opt: check the return values of av_get_token for ENOMEM. doc: Fix best_nb_channells typo matroska: pass the lace size to the matroska_parse_rm_audio Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * opt: check the return values of av_get_token for ENOMEM.Anton Khirnov2013-04-041-0/+7
| |
| * doc: Fix best_nb_channells typoPeter Meerwald2013-04-041-3/+3
| | | | | | | | | | Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * matroska: pass the lace size to the matroska_parse_rm_audioLuca Barbato2013-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | Each lace must be independent according to the specification. Fix heap-buffer-overflow in matroska_parse_block for corrupted real media in mkv files. Stricter check than fc43c19a567aa945398dccb491d972c11ec2a065 CC: libav-stable@libav.org
* | Merge commit '8a96df7b70be509dae9ceec82d2c10a20361356d'Michael Niedermayer2013-04-041-1/+1
|\| | | | | | | | | | | | | * commit '8a96df7b70be509dae9ceec82d2c10a20361356d': matroska: fix a corner case in ebml-lace parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: fix a corner case in ebml-lace parsingLuca Barbato2013-04-031-1/+1
| | | | | | | | | | | | Make sure we notice when the lace_size[n] is a negative value. CC: libav-stable@libav.org
* | Merge commit 'fc43c19a567aa945398dccb491d972c11ec2a065'Michael Niedermayer2013-04-041-4/+4
|\| | | | | | | | | | | | | | | * commit 'fc43c19a567aa945398dccb491d972c11ec2a065': matroska: Update the available size after lace parsing clang: use -fsantize=address and -fsanitize=thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroska: Update the available size after lace parsingDale Curtis2013-04-031-3/+4
| | | | | | | | | | | | | | | | | | Fix heap-buffer-overflow in matroska_parse_block for corrupted real media in mkv files. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * clang: use -fsantize=address and -fsanitize=threadLuca Barbato2013-04-031-4/+4
| | | | | | | | The previous syntax is deprecated.
* | doc/ffprobe: fix references in See Also sectionStefano Sabatini2013-04-041-1/+1
| |
* | oggdec: Support byte based seekingMichael Niedermayer2013-04-041-0/+5
| | | | | | | | | | | | Fixed Ticket2317 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Add a mechanism to allow demuxers to detect byte based seeking.Michael Niedermayer2013-04-042-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed.Carl Eugen Hoyos2013-04-041-2/+4
| | | | | | | | Tested-by: Nevcairiel
* | matroskadec: fix display_width/height = 0 handlingMichael Niedermayer2013-04-031-4/+4
| | | | | | | | | | | | Fixes Ticket2424 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/fate.texi: fix typoStefano Sabatini2013-04-031-1/+1
| |
* | doc/filters: fix error in blend descriptionPaul B Mahol2013-04-031-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-04-0315-105/+103
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavc: do not init frame with guessed layout. lavfi/af_atempo: simplify request_frame loop. lavfi/af_asetnsamples: simplify request_frame loop. lavfi/f_ebur128: remove request_frame hack. lavfi/vf_tile: simplify request_frame loop. lavfi: reindent after last commit. lavfi: loop on request_frame if necessary. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavc: do not init frame with guessed layout.Nicolas George2013-04-038-50/+42
| | | | | | | | | | | | It is breaking support from files with unknown layout.
| * | lavfi/af_atempo: simplify request_frame loop.Nicolas George2013-04-031-8/+3
| | |
| * | lavfi/af_asetnsamples: simplify request_frame loop.Nicolas George2013-04-031-8/+2
| | |
| * | lavfi/f_ebur128: remove request_frame hack.Nicolas George2013-04-031-19/+4
| | |
| * | lavfi/vf_tile: simplify request_frame loop.Nicolas George2013-04-031-10/+5
| | |
| * | lavfi: reindent after last commit.Nicolas George2013-04-031-10/+9
| | |
| * | lavfi: loop on request_frame if necessary.Nicolas George2013-04-033-2/+40
| | | | | | | | | | | | | | | | | | | | | Some filters need several input frames before producing output. For these filter, it becomes simpler to return 0 in request_frame() and let the framework call it again until output has been produced.
* | | Skip padding in an id3 tag in aiff files.Carl Eugen Hoyos2013-04-031-1/+4
|/ / | | | | | | | | | | Fixes ticket #2430. Reviewed-by: Matthieu Bouron
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-04-032-0/+3
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Fix make checkheaders without opencl headers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fix make checkheaders without opencl headers.Carl Eugen Hoyos2013-04-032-0/+3
| | |