generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,681 Commits 24 Branches 241 Tags 173 MiB
e82f562fa5
Commit Graph

51681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
14de77d677 matroskadec: fix return code for too long xiph laces 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 15:13:53 +02:00
Michael Niedermayer
740ebe468c dfa: remove redundant check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 14:49:00 +02:00
Michael Niedermayer
7ad359b394 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  xmv: do not leak memory in the error paths in xmv_read_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 14:35:40 +02:00
Michael Niedermayer
208be6b54a Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c' 
* 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>
 2013-04-04 14:20:51 +02:00
Nicolas George
83affcde51 lavc: use packet duration for subtitles if necessary. 
Fix trac ticket #2397.
 2013-04-04 14:04:51 +02:00
Michael Niedermayer
cdafcf838c Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a' 
* 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>
 2013-04-04 13:41:01 +02:00
Michael Niedermayer
ab2989378f Merge commit 'dbb1425811a672eddf4acf0513237cdf20f83756' 
* commit 'dbb1425811a672eddf4acf0513237cdf20f83756':
  lavf: make sure stream probe data gets freed.
  avfiltergraph: set deprecated filter_count.

Conflicts:
	libavformat/utils.c

See: 44a7a6300d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 13:24:33 +02:00
Michael Niedermayer
e7389ed5d0 Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' 
* 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>
 2013-04-04 13:00:59 +02:00
Michael Niedermayer
534b292102 Merge commit '8a96df7b70be509dae9ceec82d2c10a20361356d' 
* commit '8a96df7b70be509dae9ceec82d2c10a20361356d':
  matroska: fix a corner case in ebml-lace parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 12:46:47 +02:00
Michael Niedermayer
57b191b82a Merge commit 'fc43c19a567aa945398dccb491d972c11ec2a065' 
* commit 'fc43c19a567aa945398dccb491d972c11ec2a065':
  matroska: Update the available size after lace parsing
  clang: use -fsantize=address and -fsanitize=thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 12:39:18 +02:00
Stefano Sabatini
d344b99954 doc/ffprobe: fix references in See Also section 2013-04-04 10:13:30 +02:00
Anton Khirnov
f8080bd13b xmv: do not leak memory in the error paths in xmv_read_header() 
CC: libav-stable@libav.org
 2013-04-04 07:54:45 +02:00
Anton Khirnov
d1016dccdc xmv: check audio track parameters validity. 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-04-04 07:54:35 +02:00
Anton Khirnov
b88f902125 bmv: check for len being valid in bmv_decode_frame(). 
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
 2013-04-04 07:54:27 +02:00
Anton Khirnov
8d617b11cf id3v2: pad the APIC packets as required by lavc. 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-04-04 07:54:15 +02:00
Anton Khirnov
3623589edc dfa: check for invalid access in decode_wdlt(). 
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
 2013-04-04 07:54:07 +02:00
Anton Khirnov
dbb1425811 lavf: make sure stream probe data gets freed. 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-04-04 07:54:00 +02:00
Anton Khirnov
6d0546bbaf avfiltergraph: set deprecated filter_count. 2013-04-04 07:52:32 +02:00
Anton Khirnov
bcc9432898 opt: check the return values of av_get_token for ENOMEM. 2013-04-04 07:51:53 +02:00
Peter Meerwald
dfcbe8cbd7 doc: Fix best_nb_channells typo 
Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-04 07:51:28 +02:00
Michael Niedermayer
e278500181 oggdec: Support byte based seeking 
Fixed Ticket2317

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 04:04:24 +02:00
Michael Niedermayer
e10f5bd05c avformat: Add a mechanism to allow demuxers to detect byte based seeking. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 04:04:24 +02:00
Carl Eugen Hoyos
1c0d8f2563 Add a work-around for msvc compilation until c99-to-c89 issue 7 is fixed. 
Tested-by: Nevcairiel
 2013-04-04 00:01:34 +02:00
Michael Niedermayer
f51ce34e5e matroskadec: fix display_width/height = 0 handling 
Fixes Ticket2424

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 23:45:32 +02:00
Stefano Sabatini
36babfdc39 doc/fate.texi: fix typo 2013-04-03 21:07:15 +02:00
Paul B Mahol
9cb25440b3 doc/filters: fix error in blend description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 17:06:25 +00:00
Michael Niedermayer
5c6f7ed667 Merge remote-tracking branch 'cigaes/master' 
* 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>
 2013-04-03 18:29:23 +02:00
Nicolas George
464f94b206 lavc: do not init frame with guessed layout. 
It is breaking support from files with unknown layout.
 2013-04-03 17:44:10 +02:00
Nicolas George
d38c173dfb lavfi/af_atempo: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
Nicolas George
b570f24d76 lavfi/af_asetnsamples: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
Nicolas George
9566ba91ab lavfi/f_ebur128: remove request_frame hack. 2013-04-03 17:44:10 +02:00
Nicolas George
77fa554b6e lavfi/vf_tile: simplify request_frame loop. 2013-04-03 17:44:10 +02:00
Nicolas George
69d67fb622 lavfi: reindent after last commit. 2013-04-03 17:44:10 +02:00
Nicolas George
79d8cfacf0 lavfi: loop on request_frame if necessary. 
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.
 2013-04-03 17:33:27 +02:00
Carl Eugen Hoyos
db2d3a9082 Skip padding in an id3 tag in aiff files. 
Fixes ticket #2430.

Reviewed-by: Matthieu Bouron
 2013-04-03 15:45:46 +02:00
Michael Niedermayer
c208576cef Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix make checkheaders without opencl headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 15:35:23 +02:00
Carl Eugen Hoyos
c484b3af15 Fix make checkheaders without opencl headers. 2013-04-03 15:28:29 +02:00
Michael Niedermayer
d3fc2db47e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 15:20:05 +02:00
Michael Niedermayer
4d636947b4 Merge commit '817dff578f13ce97576c609ab141508b9dc782e9' 
* commit '817dff578f13ce97576c609ab141508b9dc782e9':
  configure: Check for the atomic.h functions used in the suncc atomics header

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 15:08:21 +02:00
Paul B Mahol
e3cc92a623 smacker: fix off by one error 
Regression since a93b572ae4.

Fixes #2426.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 13:01:38 +00:00
Michael Niedermayer
6ce1d87355 Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65' 
* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
  configure: prettify atomics handling.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 14:46:48 +02:00
Paul B Mahol
6fcb4ae1d8 lavfi/afade * biquads: call av_frame_copy_props() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 11:10:00 +00:00
Paul B Mahol
0ab10f69ef lavfi/earwax: clip sample, this is what sox does 
Fixes #1884.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 10:55:13 +00:00
Carl Eugen Hoyos
6e90d9e206 vf_deshake: Reorder constant arguments in an if() statement. 
Fixes compilation with clang on netbsd with --disable-optimizations.

Tested-by: Paul B Mahol
 2013-04-03 12:52:38 +02:00
Luca Barbato
25a80a931a matroska: pass the lace size to the matroska_parse_rm_audio 
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 fc43c19a56

CC: libav-stable@libav.org
 2013-04-03 12:34:38 +02:00
Luca Barbato
8a96df7b70 matroska: fix a corner case in ebml-lace parsing 
Make sure we notice when the lace_size[n] is a negative value.

CC: libav-stable@libav.org
 2013-04-03 12:33:15 +02:00
Dale Curtis
fc43c19a56 matroska: Update the available size after lace parsing 
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>
 2013-04-03 12:33:01 +02:00
Luca Barbato
19f251a288 clang: use -fsantize=address and -fsanitize=thread 
The previous syntax is deprecated.
 2013-04-03 12:23:43 +02:00
Paul B Mahol
bf65752848 aphaser filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-03 08:33:59 +00:00
Anton Khirnov
6e3c13a559 avfiltergraph: check for sws opts being non-NULL before using them. 
Avoid snprintfing a NULL pointer.

CC: libav-stable@libav.org
 2013-04-03 09:29:55 +02:00