RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,174 Commits 37 Branches 400 Tags 274 MiB
Commit Graph

41174 Commits

Author SHA1 Message Date
Michael Niedermayer cc4d80c99f ipmovie_probe: speedup by avoiding memcmp() call 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 16:19:26 +02:00
Michael Niedermayer ebfe0c6eb8 ac3_probe: speedup by checking for header earlier 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 16:14:27 +02:00
Michael Niedermayer 6cfaccabc4 probetest: allow specifying parameters on the command line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 15:53:58 +02:00
Michael Niedermayer 76170f5373 yop_probe: check more fields to avoid detecting random data as yop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 14:47:15 +02:00
Michael Niedermayer 60de761657 ffmpeg: allow overriding input top field first 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 12:42:02 +02:00
Paul B Mahol 824a6975ee binkaudio: check number of channels 
Fixes #1380.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-31 08:58:31 +00:00
Michael Niedermayer 8aaa00c301 indeo5: check quant_mat 
prevents out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 05:07:51 +02:00
Michael Niedermayer 3b275ce374 fate: dont freopen() stdout 
it doesnt work and breaks most BSDs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 02:56:56 +02:00
Michael Niedermayer 0dfcd7e7e3 range coder test code: decoding errors are av_log_error not debug. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 00:48:29 +02:00
Michael Niedermayer 21fdf1ccf0 ffv1: fix reading global header with CRC 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 00:47:36 +02:00
Michael Niedermayer 57778f61d0 avidec: fix odd extradata size case. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 00:46:47 +02:00
Michael Niedermayer 76853a3e0c libavformat: ff_get_bmp_header: return esize too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 00:46:02 +02:00
Michael Niedermayer a1fc1d2e1b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm-mpeg: improve log message wording
  fate: add missing $(TARGET_PATH) to ac3-fixed-encode
  fate: fix md5sum replacement on some systems
  avprobe: correctly set the default formatter
  lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
  lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
  lavr: add C functions for mixing 2 to 1 channels with s16p format
  avprobe: move formatter functions in the context

Conflicts:
	ffprobe.c
	libavcodec/pcm-mpeg.c
	tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 19:32:06 +02:00
Christian Schmidt d041dec3cb pcm-mpeg: improve log message wording 
We support every defined value for channel layout, bitrate and sample depth.
All other values are not unsupported, but reserved.
Update comments to say "are used" instead of "are known or exist".

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-05-30 11:27:29 -04:00
Michael Niedermayer 39f0a45a1a h264_cavlc: check prefix before using it. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 16:42:01 +02:00
Michael Niedermayer 32e60b6bfe h264: increase scantable sizes to avoid overread 
We could also check the index but this would slow speed critical code
down.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 16:40:33 +02:00
Michael Niedermayer fd4c1c0b70 truemotion1: Check index, fix out of array read 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 16:20:22 +02:00
Michael Niedermayer 96fe99cb11 ffmpeg: disable autoinsertion for -async on the output side of the filtergraph. 
This fixes the issue that since the last merge -async caused 2 aresample
filters to be inserted
users that generate funny timestamps in a filtergraph should probably
manually insert a aresample filter where they need it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 15:55:31 +02:00
Michael Niedermayer 89cf5bf39a cmdutils: replace 1 line #ifs by if() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 15:45:05 +02:00
Gavin Kinsey bf6fb563b9 Allow building of command line utils without swresample lib 
This allows building ffprobe without swresample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 15:45:05 +02:00
Paul B Mahol f5af8d5e76 exr: make message about missing feature more useful 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-30 12:07:41 +00:00
Michael Niedermayer d24ef674ec fate: fix long standing bug in the g723_1 test 
The test compared files of mismatching sample rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 13:28:42 +02:00
Michael Niedermayer f5e0ef536a fate: add a fate-acodec-dca test that works on all platforms second try 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 13:10:22 +02:00
Michael Niedermayer 607461e50d fate: add bitexact flag to ac3-fixed 
cant hurt, and should be there for all tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 13:10:22 +02:00
Paul B Mahol 8f61526978 iff: check if there is extradata 
Fixes #1368.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-30 07:50:32 +00:00
Paul B Mahol d66b0cd5c5 exr: alpha support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-30 07:06:12 +00:00
Mans Rullgard 0857e46dd5 fate: add missing $(TARGET_PATH) to ac3-fixed-encode 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-30 07:55:13 +01:00
Mans Rullgard 00c78a0a15 fate: fix md5sum replacement on some systems 
On systems where the 'md5' command is used, there is a conflict
with the md5() shell function in fate-run.sh.  Using the 'command'
keyword bypasses the shell function for correct behaviour.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-30 07:52:35 +01:00
Michael Niedermayer 7a2ae764f4 fate: disable fate-acodec-dca 
the new test doesnt work on all platforms, thus disable it until a better solution is found.
the dca2 test remains and provides partial testing until this is resolved

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 06:48:13 +02:00
Michael Niedermayer ef96ec97fb fate: remove unused functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 05:57:56 +02:00
Michael Niedermayer 6aceed3b72 fate: remove tests/codec-regression.sh 
This was somehow forgotten in todays merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 05:57:56 +02:00
Michael Niedermayer 5855e46398 fate: resurrect acodec-dca 
This was lost in todays merge
Ideas to do this less ugly are welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 05:57:56 +02:00
Lou Logan 73f3f6baff lavc: clarify experimental codec message 
Should be easier for new users to get a working output.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 05:02:54 +02:00
Michael Niedermayer fd707add6b fate: try to fix fate-nellymoser-aref-encode make dependancies 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 04:52:13 +02:00
Michael Niedermayer e0a01e4c85 fate: make idroq test run again. 
Didnt investigate what broke it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 04:38:41 +02:00
Michael Niedermayer 16e25ef34b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: extend -r to work on any input stream.
  doc/avconv: expand documentation for the -s option.
  avconv: don't print filters inserted by avconv in stream mappings.
  avconv: merge configuration code for complex and simple filters
  avconv: split configuring input filters out of configure_complex_filter

Conflicts:
	configure
	doc/ffmpeg.texi
	ffmpeg.c
	tests/ref/fate/idroq-video-encode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 04:38:32 +02:00
Michael Niedermayer b0387edd5e Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 01:40:54 +02:00
Clément Bœsch 8619362ff1 ffprobe: fix C escaping. 2012-05-30 01:07:41 +02:00
Luca Barbato 43b50e62c4 avprobe: correctly set the default formatter 2012-05-29 14:09:43 -07:00
Clément Bœsch 2d52ee8a1a lavf/microdvd: support events lasting to the next one. 
Example:

{3350}{}this subtitle...
{3390}{}...continues up to...
{4000}{4500}this one.
{4600}{}and now...
{4800}{}...to the end of the presentation
 2012-05-29 21:33:28 +02:00
Clément Bœsch d51e08bb89 lavc: switch from ts_end to duration in ff_ass_add_rect. 
Make possible a end-to-presentation duration.
 2012-05-29 21:33:28 +02:00
Justin Ruggles b75726cb79 lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs 2012-05-29 15:33:25 -04:00
Justin Ruggles c140fb2cbc lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs 2012-05-29 15:33:18 -04:00
Justin Ruggles 8dfc122719 lavr: add C functions for mixing 2 to 1 channels with s16p format 2012-05-29 15:16:20 -04:00
Luca Barbato 528995589f avprobe: move formatter functions in the context 
Avoid possible clashes.
 2012-05-29 11:00:12 -07:00
Michael Niedermayer e7cb161515 ape: Fix null ptr dereference with files missing a seekatable. 
Such files are currently not supported as the table is used at several points

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-29 19:56:07 +02:00
Michael Niedermayer 5880d78873 movdec: Check count of stts/ctts elements instead of just the pointer. 
Fixes overreading the array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-29 19:56:07 +02:00
Michael Niedermayer 1b8741a684 4xm: fix division by zero caused by bps<8 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-29 19:56:07 +02:00
Anton Khirnov c9cc76290f avconv: extend -r to work on any input stream. 
This is done by automatically inserting a setpts filter.
 2012-05-29 19:19:17 +02:00
Anton Khirnov 4f81a5072a doc/avconv: expand documentation for the -s option. 2012-05-29 19:19:16 +02:00