virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
42,509 Commits 37 Branches 400 Tags 465 MiB
7b521c52c4
Commit Graph

42509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ca1f2b3e10 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
  x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
  id3v2: add a mimetype for bmp pictures.
  flacdec: be less strict when parsing attached pictures.
  flacdec: don't create an attached picture stream until we have all information.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 22:33:32 +02:00
Michael Niedermayer
d8ce478c43 lavf: limit "Adjusting PTS forward" code to video streams 
It can end up slightly messing up a series of valid timestamps
after a invalid one.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 22:29:34 +02:00
Justin Ruggles
6410397600 lavr: resampling: add support for s32p, fltp, and dblp internal sample formats 
Based partially on implementation by Michael Niedermayer <michaelni@gmx.at> in
libswresample in FFmpeg. See commits:
7f1ae79d38
24ab1abfb6
 2012-07-08 15:22:11 -04:00
Justin Ruggles
372647aed0 lavr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-08 15:22:11 -04:00
Justin Ruggles
8ca08066fc lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format 
Also make this the default value.
 2012-07-08 15:22:11 -04:00
Justin Ruggles
db0e7bd0bd lavr: mix: validate internal sample format in ff_audio_mix_init() 2012-07-08 15:22:11 -04:00
Nicolas George
299387ebf4 vf_settb: rename the file as f_settb. 2012-07-08 19:54:08 +02:00
Nicolas George
65e65e3ce2 settb: cosmetic: reindent vf_settb structure. 2012-07-08 19:54:08 +02:00
Nicolas George
ba856c0be5 lavfi: implement asettb filter. 2012-07-08 19:54:08 +02:00
Michael Niedermayer
99622f6678 mpegaudioenc: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 17:59:56 +02:00
Michael Niedermayer
a6a085a928 v4l2: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 17:59:56 +02:00
Stefano Sabatini
3f345290dc lavf/segment: sort options 2012-07-08 17:38:24 +02:00
Stefano Sabatini
8dc31f8da8 lavf/segment: make use of av_parse_time() when parsing the -segment_time value 
Increase flexibility/consistency.

Also rename recording_time field to time, for enhanced
consistency/readability.
 2012-07-08 17:38:04 +02:00
Stefano Sabatini
0a7b8effbb doc/muxers: sort options for the segment muxer 2012-07-08 17:08:56 +02:00
Stefano Sabatini
7f08bfae6e lavf/segment: add segment_list_type option, extend format for the segment list file 
Add list extended format which specifies in the list file the start and
ending time for each segment. This is required to make it available this
information to external tools, avoiding the need to perform file analysis
in the output segments.
 2012-07-08 17:08:56 +02:00
Stefano Sabatini
b010d9b586 lavf/nutenc: provide meaningful error message and error code in case of invalid pts 2012-07-08 17:08:56 +02:00
Nicolas George
bba819bd8f fate: FLAC tests require SAMPLES. 2012-07-08 13:41:39 +02:00
Michael Niedermayer
e145afb4b0 vf_tinterlace: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 03:47:38 +02:00
Stefano Sabatini
abb0a9982f lavfi: do not pass opaque field to init functions 
Fix signature mismatch warnings.
 2012-07-08 01:18:15 +02:00
Paul B Mahol
2d42008757 sanm: make use of dsputil 
About 27% faster decoding.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-07 22:33:13 +00:00
Michael Niedermayer
acdf9a6ca5 aacdec: correct "audio config changed" warning message 
Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 00:26:27 +02:00
Hendrik Leppkes
d039b6074c latm: fix initialization on some streams when no extradata is available 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-08 00:26:26 +02:00
Ronald S. Bultje
66a297975d cmutils: include shellapi.h on Win32 (for CommandLineToArgvW). 
This is required for CommandLineToArgvW. Normally, shellapi.h is included
implicitly by windows.h, but if we define WIN32_LEAN_AND_MEAN (or some of
the other earlier headers have included windows.h with that option),
windows.h doesn't include this one.

Thus explicitly include the headers we really need, for clarity and
compatibility.
 2012-07-07 14:09:04 -07:00
Clément Bœsch
7073174551 x86inc: put basicnop under ifdef to prevent compile failure. 
This should fix the NASM box.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 22:48:43 +02:00
Ronald S. Bultje
07b287020c x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME). 2012-07-07 13:35:07 -07:00
Michael Niedermayer
68712ce820 swr/x86: 16bit integer mix functions need SSE2 not SSE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 20:52:34 +02:00
Anton Khirnov
25b51b2c44 id3v2: add a mimetype for bmp pictures. 2012-07-07 20:34:41 +02:00
Anton Khirnov
b7d3a9a015 flacdec: be less strict when parsing attached pictures. 
Only return an error if memory allocation fails or error recognition is
set to explode. Otherwise just print an error message and continue
reading the file.
 2012-07-07 20:34:20 +02:00
Anton Khirnov
dba5b06ead flacdec: don't create an attached picture stream until we have all information. 
This way we don't end with an invalid stream if parsing the picture
fails.
 2012-07-07 20:33:44 +02:00
Michael Niedermayer
3245c8b669 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..).
  x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro

Conflicts:
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 20:29:43 +02:00
Loren Merritt
e14052dbc8 x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 20:26:39 +02:00
Michael Niedermayer
dc12f7d4ec x86inc: try to put amdnop under ifdef to prevent compile failure 
based on similar amdnop usage in ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 20:16:56 +02:00
Michael Niedermayer
9fb08427d7 vf_pp: dont pass NULL into pp, it would fail 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 19:14:51 +02:00
Michael Niedermayer
561a365dca pp: check that the argument is not NULL as this is not supported 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 19:14:21 +02:00
Ronald S. Bultje
fdaad6354f mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..). 
Also replace x>>av_log2(sizeof(..)) + 1 by x/sizeof(..). The +1 is
probably meant to emulate av_log2_ceil(sizeof(..)) in cases where ".."
is not a power of two.
 2012-07-07 10:09:59 -07:00
Tim Nicholson
bb62a8b690 doc: update mono to stereo workaround example 
Now uses -filter_complex instead of deprecated lavfi/amovie

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 17:37:16 +02:00
Michael Niedermayer
dadfd2a525 tools/bisect: rename to tools/bisect-create 
Idea-by: Alexander Strasser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 14:51:51 +02:00
Michael Niedermayer
6de70d7fbf tools/bisect: rename temporary file and add it to git ignore 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 13:15:01 +02:00
Michael Niedermayer
ccc0a3a9fa tool/bisect: add some magic to make the bisect tool be useable when its not part of a checkout 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 13:10:06 +02:00
Hendrik Leppkes
d9dcc940fa vc1: implement frame interlaced b-frame header parsing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 13:02:22 +02:00
Michael Niedermayer
50bfd547b9 log: fix compilation failure on mingw due to reference to undefined set_color256 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 12:57:13 +02:00
Michael Niedermayer
d3f4fd76d5 celp_math: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 12:34:04 +02:00
Michael Niedermayer
dc7aecd8f7 cabac: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 12:33:51 +02:00
Paul B Mahol
1842b27564 lavu: 256 color support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-07 01:41:55 +00:00
Michael Niedermayer
46a47077ee Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: add functions for testing code fragments
  af_amix: avoid spurious EAGAIN.
  af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.
  af_amix: only consider negative return codes as errors.
  avconv: use only meaningful timestamps in start time check.
  avconv: fix the check for -ss as an output option.
  mss3: add forgotten 'static' qualifier for private table
  lavc: options: add planar names for request_sample_fmt
  flacdec: add planar output support
  flvdec: Treat all nellymoser versions as the same codec

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 02:17:30 +02:00
Paul B Mahol
a6da14ec3c tiffenc: PIX_FMT_GRAY8A support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-06 19:54:10 +00:00
Paul B Mahol
df548c59f7 tiffenc: PIX_FMT_GRAY16LE support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-06 19:40:45 +00:00
Paul B Mahol
1806858fdd tiffenc: merge common code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-06 19:39:32 +00:00
Paul B Mahol
146d29c744 tiffenc: use av_get_bits_per_pixel() to get bpp 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-06 19:39:24 +00:00
Paul B Mahol
82c4abbfe1 tiffenc: use av_pix_fmt_descriptors to set bpp_tab[] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-06 19:32:44 +00:00