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

42387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f8911b987d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mss3: use standard zigzag table
  mss3: split DSP functions that are used in MTS2(MSS4) into separate file
  motion-test: do not use getopt()
  tcp: add initial timeout limit for incoming connections
  configure: Change the rdtsc check to a linker check
  avconv: propagate fatal errors from lavfi.
  lavfi: add error handling to filter_samples().
  fate-run: make avconv() properly deal with multiple inputs.
  asplit: don't leak the input buffer.
  af_resample: fix request_frame() behavior.
  af_asyncts: fix request_frame() behavior.
  libx264: support aspect ratio switching
  matroskadec: honor error_recognition when encountering unknown elements.
  lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
  lavr: resampling: add filter type and Kaiser window beta to AVOptions
  lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
  lavr: mix: validate internal sample format in ff_audio_mix_init()

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/libx264.c
	libavfilter/audio.c
	libavfilter/split.c
	libavformat/tcp.c
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-09 22:40:12 +02:00
Kostya Shishkov
5467742232 mss3: use standard zigzag table 2012-07-09 18:17:51 +02:00
Kostya Shishkov
acfb6b6cf8 mss3: split DSP functions that are used in MTS2(MSS4) into separate file 2012-07-09 18:17:51 +02:00
Anton Khirnov
82f82ccfc8 motion-test: do not use getopt() 
It is not available on all systems and using argc/argv directly actually
makes the code simpler.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-07-09 17:20:52 +02:00
Jordi Ortiz
5427df0186 tcp: add initial timeout limit for incoming connections 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-09 17:30:19 +03:00
Michael Niedermayer
bf5386385d mpeg12: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-09 15:38:28 +02:00
Michael Niedermayer
cdb3f2f5f0 mpeg12enc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-09 15:38:16 +02:00
Al@dneg.com
c88a832735 movenc: Addtion of \251cmt field to udta 
Allows support of comment in udta for libquicktime, also currently \251des is used
 which is ignored by mov.c.
\251cmt IS currently already picked up by mov.c

References

libquicktime
http://libquicktime.cvs.sourceforge.net/viewvc/libquicktime/libquicktime/src/udta.c?view=markup

Also listed here:
http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/QuickTime.html#UserData

Not listed here, but that`s not entirely surprising, as udta fields are expected to be somewhat arbitary.
http://developer.apple.com/library/mac/#documentation/QuickTime/qtff/QTFFChap2/qtff2.html#//apple_ref/doc/uid/TP40000939-CH204-BBCCFFGD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-09 15:30:59 +02:00
Carl Eugen Hoyos
36b2bd9629 Show hyphen in codec tag. 2012-07-09 13:46:55 +02:00
Diego Biurrun
8e85ba8d13 configure: Change the rdtsc check to a linker check 
A compile-only test could succeed with an implicit function declaration.
Also move the check to the x86 section; rdtsc is x86-only.
 2012-07-09 12:50:06 +02:00
Anton Khirnov
8a645bfc31 avconv: propagate fatal errors from lavfi. 2012-07-09 08:32:49 +02:00
Anton Khirnov
cd99146253 lavfi: add error handling to filter_samples(). 2012-07-09 08:25:19 +02:00
Anton Khirnov
8d18bc550e fate-run: make avconv() properly deal with multiple inputs. 2012-07-09 08:22:38 +02:00
Anton Khirnov
083d0f6be8 asplit: don't leak the input buffer. 2012-07-09 08:22:11 +02:00
Anton Khirnov
1ffb645662 af_resample: fix request_frame() behavior. 
Make sure that an output frame has really been produced before returning
0.
 2012-07-09 08:21:37 +02:00
Anton Khirnov
6f834293d3 af_asyncts: fix request_frame() behavior. 
Make sure that an output frame has really been produced before returning
0.
 2012-07-09 08:21:15 +02:00
JULIAN GARDNER
0dd283faca libx264: support aspect ratio switching 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-07-09 08:15:59 +02:00
Anton Khirnov
5b7a88f0ba matroskadec: honor error_recognition when encountering unknown elements. 2012-07-09 07:43:11 +02:00
Paul B Mahol
07df939aa3 exr: support for reading pixelAspectRatio 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-09 02:51:06 +00:00
Paul B Mahol
16a433d68b tiffenc: PIX_FMT_YUV440P support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-09 01:55:16 +00:00
Paul B Mahol
e2a6eb8da4 sgidec: add CODEC_CAP_DR1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 23:43:18 +00:00
Paul B Mahol
0f65693529 sgidec: remove redundant argument from read_uncompressed_sgi() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 23:40:55 +00:00
Paul B Mahol
60351ec13c g723_1: add CODEC_CAP_DR1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 23:40:55 +00:00
Paul B Mahol
5d23043c12 exr: add CODEC_CAP_DR1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 23:40:55 +00:00
Paul B Mahol
104ea00108 dpx: add CODEC_CAP_DR1 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 23:40:55 +00:00
Michael Niedermayer
7bc155163e sgidec: fix off by 1 error that tested a sample too far for oob. 
This led to decoding failure when linesize was too small.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-09 01:33:44 +02:00
Paul B Mahol
30659a2233 smush: properly flag audio packets 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 20:49:35 +00:00
Paul B Mahol
26fa84105b paf: properly flag video packets 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-08 20:49:04 +00:00
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