]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 10 Jul 2012 17:37:53 +0000 (19:37 +0200)]
mpeg4videoenc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 10 Jul 2012 17:37:37 +0000 (19:37 +0200)]
mpeg4videodec: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Mon, 9 Jul 2012 07:13:21 +0000 (09:13 +0200)]
dpx: invalid aspect ratio is 0/1, not 0/0.
Carl Eugen Hoyos [Tue, 10 Jul 2012 12:29:10 +0000 (14:29 +0200)]
Set default ffv1 coder to -1.
Autoselect coder 1 instead of default coder if bits_per_raw_sample > 8.
Fixes ticket #1519.
Carl Eugen Hoyos [Tue, 10 Jul 2012 12:24:47 +0000 (14:24 +0200)]
Cosmetics: Return AVERROR_INVALIDDATA from ffv1 encoder initialisation if invalid data was provided.
Carl Eugen Hoyos [Tue, 10 Jul 2012 12:21:29 +0000 (14:21 +0200)]
Cosmetics: Move ffv1 encoder initialisation code.
Michael Niedermayer [Tue, 10 Jul 2012 12:21:06 +0000 (14:21 +0200)]
dsputil: turn assert into if() as its possible to trigger with ffv1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 10 Jul 2012 11:27:16 +0000 (13:27 +0200)]
Recognize yuv10 image files as v210x.
Reviewed-by: Kieran Kunhya
Carl Eugen Hoyos [Tue, 10 Jul 2012 11:22:01 +0000 (13:22 +0200)]
Define snow .pix_fmts to allow colour space auto-selection.
Paul B Mahol [Tue, 10 Jul 2012 01:27:40 +0000 (01:27 +0000)]
exr: return proper error code instead of -1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 10 Jul 2012 01:20:13 +0000 (01:20 +0000)]
exr: use buf_size instead of recalculating same value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 9 Jul 2012 23:04:36 +0000 (01:04 +0200)]
h264/decode_scaling_matrices: fix coding order of 8x8 matrixes.
This fixes decoding of PPCV444I3_Thomson_A.bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Jul 2012 23:35:02 +0000 (01:35 +0200)]
h264: 12 and 14 bit support
This works with I, P and B frames
CAVLC and CABAC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Jul 2012 23:34:12 +0000 (01:34 +0200)]
h264dsp: 12 and 14 bit support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Jul 2012 23:33:51 +0000 (01:33 +0200)]
h264pred: 12 and 14 bit support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Jul 2012 23:33:18 +0000 (01:33 +0200)]
h264idct: 12 and 14 bit support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 5 Jul 2012 17:13:40 +0000 (19:13 +0200)]
h264: limit 10bpp MC pading trick to 10bpp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 4 Jul 2012 23:32:13 +0000 (01:32 +0200)]
dsputil: extend things to 12 and 14 bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 8 Jul 2012 20:34:19 +0000 (20:34 +0000)]
fate: add test for paf demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 8 Jul 2012 20:18:27 +0000 (20:18 +0000)]
fate: add test for paf video decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 8 Jul 2012 20:16:12 +0000 (20:16 +0000)]
fate: add test for paf audio decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Steven Robertson [Sat, 7 Jul 2012 05:42:29 +0000 (22:42 -0700)]
lavfi/movie: reindent after the previous patch
Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Steven Robertson [Sat, 7 Jul 2012 05:41:28 +0000 (22:41 -0700)]
lavfi/movie: flush decoder frames on EOF
movie currently forwards EOF (or begins looping) immediately upon
reaching the last packet in the input stream, which can leave frames in
the decoder. This change first tries to read any remaining packets from
the decoder before forwarding EOF.
Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Thu, 5 Jul 2012 23:06:20 +0000 (01:06 +0200)]
lavfi/buffersink: restore possibility to pass opaque data
Use the init_opaque callback for the purpose.
Fix regression introduced in
a5e8c41c28f . In particular, fix lavfi
device in case a conversion to the supported (packed) formats is needed.
Stefano Sabatini [Thu, 5 Jul 2012 22:41:27 +0000 (00:41 +0200)]
lavfi: add init_opaque callback
This will be used by filters which require an opaque field to be passed
in input. Should be required only for filters which imply a programmatic
use.
This is possibly a temporary solution, to be removed when we'll have a
clearer and better agreememnt of how/if to pass binary data for
initializing a filter.
See thread:
Subject: [FFmpeg-devel][PATCH] lavfi: add init2 callback
Date: Fri, 6 Jul 2012 01:22:17 +0200
Stefano Sabatini [Sat, 28 Jan 2012 21:21:43 +0000 (22:21 +0100)]
lavf/segment: add -segment_time_delta option
Stefano Sabatini [Sat, 28 Jan 2012 21:36:38 +0000 (22:36 +0100)]
lavf/segment: add -segment_times option
Address trac ticket #1504.
Michael Niedermayer [Mon, 9 Jul 2012 20:10:38 +0000 (22:10 +0200)]
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>
Kostya Shishkov [Mon, 9 Jul 2012 16:15:27 +0000 (18:15 +0200)]
mss3: use standard zigzag table
Kostya Shishkov [Mon, 9 Jul 2012 05:55:12 +0000 (07:55 +0200)]
mss3: split DSP functions that are used in MTS2(MSS4) into separate file
Anton Khirnov [Mon, 9 Jul 2012 06:15:34 +0000 (08:15 +0200)]
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>
Jordi Ortiz [Wed, 4 Jul 2012 15:48:10 +0000 (17:48 +0200)]
tcp: add initial timeout limit for incoming connections
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 9 Jul 2012 13:38:28 +0000 (15:38 +0200)]
mpeg12: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 9 Jul 2012 13:38:16 +0000 (15:38 +0200)]
mpeg12enc: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Al@dneg.com [Mon, 9 Jul 2012 09:40:12 +0000 (10:40 +0100)]
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>
Carl Eugen Hoyos [Mon, 9 Jul 2012 11:46:55 +0000 (13:46 +0200)]
Show hyphen in codec tag.
Diego Biurrun [Sun, 8 Jul 2012 23:24:37 +0000 (01:24 +0200)]
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.
Anton Khirnov [Tue, 3 Jul 2012 09:44:46 +0000 (11:44 +0200)]
avconv: propagate fatal errors from lavfi.
Anton Khirnov [Mon, 2 Jul 2012 18:13:40 +0000 (20:13 +0200)]
lavfi: add error handling to filter_samples().
Anton Khirnov [Tue, 29 May 2012 09:41:55 +0000 (11:41 +0200)]
fate-run: make avconv() properly deal with multiple inputs.
Anton Khirnov [Tue, 3 Jul 2012 09:26:45 +0000 (11:26 +0200)]
asplit: don't leak the input buffer.
Anton Khirnov [Wed, 4 Jul 2012 14:46:17 +0000 (16:46 +0200)]
af_resample: fix request_frame() behavior.
Make sure that an output frame has really been produced before returning
0.
Anton Khirnov [Wed, 4 Jul 2012 14:46:17 +0000 (16:46 +0200)]
af_asyncts: fix request_frame() behavior.
Make sure that an output frame has really been produced before returning
0.
JULIAN GARDNER [Sun, 8 Jul 2012 14:33:47 +0000 (17:33 +0300)]
libx264: support aspect ratio switching
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 7 Jul 2012 15:15:27 +0000 (17:15 +0200)]
matroskadec: honor error_recognition when encountering unknown elements.
Paul B Mahol [Mon, 9 Jul 2012 00:51:22 +0000 (00:51 +0000)]
exr: support for reading pixelAspectRatio
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 9 Jul 2012 01:55:16 +0000 (01:55 +0000)]
tiffenc: PIX_FMT_YUV440P support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 8 Jul 2012 23:41:41 +0000 (23:41 +0000)]
sgidec: add CODEC_CAP_DR1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 8 Jul 2012 23:28:16 +0000 (23:28 +0000)]
sgidec: remove redundant argument from read_uncompressed_sgi()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 7 Jul 2012 21:05:51 +0000 (21:05 +0000)]
g723_1: add CODEC_CAP_DR1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 7 Jul 2012 20:58:33 +0000 (20:58 +0000)]
exr: add CODEC_CAP_DR1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 7 Jul 2012 20:02:20 +0000 (20:02 +0000)]
dpx: add CODEC_CAP_DR1
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 8 Jul 2012 23:31:41 +0000 (01:31 +0200)]
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>
Paul B Mahol [Sun, 8 Jul 2012 20:47:34 +0000 (20:47 +0000)]
smush: properly flag audio packets
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 8 Jul 2012 20:35:34 +0000 (20:35 +0000)]
paf: properly flag video packets
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 8 Jul 2012 20:33:32 +0000 (22:33 +0200)]
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>
Michael Niedermayer [Sun, 8 Jul 2012 20:18:34 +0000 (22:18 +0200)]
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>
Justin Ruggles [Mon, 28 May 2012 01:44:55 +0000 (21:44 -0400)]
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:
7f1ae79d38c4edba9dbd31d7bf797e525298ac55
24ab1abfb6d55bf330022df4b10d7aec80b3f116
Justin Ruggles [Sat, 26 May 2012 18:50:02 +0000 (14:50 -0400)]
lavr: resampling: add filter type and Kaiser window beta to AVOptions
Justin Ruggles [Fri, 1 Jun 2012 19:19:45 +0000 (15:19 -0400)]
lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
Also make this the default value.
Justin Ruggles [Fri, 1 Jun 2012 19:12:03 +0000 (15:12 -0400)]
lavr: mix: validate internal sample format in ff_audio_mix_init()
Nicolas George [Sun, 8 Jul 2012 17:45:33 +0000 (19:45 +0200)]
vf_settb: rename the file as f_settb.
Nicolas George [Sun, 8 Jul 2012 17:43:34 +0000 (19:43 +0200)]
settb: cosmetic: reindent vf_settb structure.
Nicolas George [Sat, 23 Jun 2012 10:19:14 +0000 (12:19 +0200)]
lavfi: implement asettb filter.
Michael Niedermayer [Sun, 8 Jul 2012 15:12:39 +0000 (17:12 +0200)]
mpegaudioenc: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 8 Jul 2012 15:05:35 +0000 (17:05 +0200)]
v4l2: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 8 Jul 2012 15:38:24 +0000 (17:38 +0200)]
lavf/segment: sort options
Stefano Sabatini [Sun, 8 Jul 2012 15:26:33 +0000 (17:26 +0200)]
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.
Stefano Sabatini [Sun, 8 Jul 2012 14:45:37 +0000 (16:45 +0200)]
doc/muxers: sort options for the segment muxer
Stefano Sabatini [Fri, 13 Jan 2012 22:29:09 +0000 (23:29 +0100)]
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.
Stefano Sabatini [Sun, 8 Jul 2012 11:43:47 +0000 (13:43 +0200)]
lavf/nutenc: provide meaningful error message and error code in case of invalid pts
Nicolas George [Sun, 8 Jul 2012 11:41:39 +0000 (13:41 +0200)]
fate: FLAC tests require SAMPLES.
Michael Niedermayer [Sun, 8 Jul 2012 01:46:59 +0000 (03:46 +0200)]
vf_tinterlace: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 5 Jul 2012 22:45:36 +0000 (00:45 +0200)]
lavfi: do not pass opaque field to init functions
Fix signature mismatch warnings.
Paul B Mahol [Sat, 7 Jul 2012 17:01:31 +0000 (17:01 +0000)]
sanm: make use of dsputil
About 27% faster decoding.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 7 Jul 2012 22:20:21 +0000 (00:20 +0200)]
aacdec: correct "audio config changed" warning message
Idea-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 22 Dec 2011 23:14:32 +0000 (00:14 +0100)]
latm: fix initialization on some streams when no extradata is available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 7 Jul 2012 20:46:26 +0000 (13:46 -0700)]
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.
Clément Bœsch [Sat, 7 Jul 2012 20:48:41 +0000 (22:48 +0200)]
x86inc: put basicnop under ifdef to prevent compile failure.
This should fix the NASM box.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 7 Jul 2012 20:30:11 +0000 (13:30 -0700)]
x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
Michael Niedermayer [Sat, 7 Jul 2012 18:52:34 +0000 (20:52 +0200)]
swr/x86: 16bit integer mix functions need SSE2 not SSE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 6 Jul 2012 20:35:10 +0000 (22:35 +0200)]
id3v2: add a mimetype for bmp pictures.
Anton Khirnov [Fri, 6 Jul 2012 20:30:17 +0000 (22:30 +0200)]
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.
Anton Khirnov [Fri, 6 Jul 2012 20:21:09 +0000 (22:21 +0200)]
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.
Michael Niedermayer [Sat, 7 Jul 2012 18:29:43 +0000 (20:29 +0200)]
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>
Loren Merritt [Wed, 4 Jul 2012 13:32:16 +0000 (15:32 +0200)]
x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jul 2012 18:16:56 +0000 (20:16 +0200)]
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>
Michael Niedermayer [Sat, 7 Jul 2012 17:14:51 +0000 (19:14 +0200)]
vf_pp: dont pass NULL into pp, it would fail
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jul 2012 17:14:21 +0000 (19:14 +0200)]
pp: check that the argument is not NULL as this is not supported
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Wed, 4 Jul 2012 15:13:43 +0000 (08:13 -0700)]
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.
Tim Nicholson [Tue, 3 Jul 2012 10:42:51 +0000 (11:42 +0100)]
doc: update mono to stereo workaround example
Now uses -filter_complex instead of deprecated lavfi/amovie
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jul 2012 12:49:44 +0000 (14:49 +0200)]
tools/bisect: rename to tools/bisect-create
Idea-by: Alexander Strasser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 11:57:15 +0000 (13:57 +0200)]
tools/bisect: rename temporary file and add it to git ignore
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 11:53:26 +0000 (13:53 +0200)]
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>
Hendrik Leppkes [Mon, 23 Jan 2012 21:17:46 +0000 (22:17 +0100)]
vc1: implement frame interlaced b-frame header parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jul 2012 10:54:03 +0000 (12:54 +0200)]
log: fix compilation failure on mingw due to reference to undefined set_color256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jul 2012 10:34:04 +0000 (12:34 +0200)]
celp_math: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 7 Jul 2012 10:33:51 +0000 (12:33 +0200)]
cabac: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 4 Jul 2012 17:22:16 +0000 (17:22 +0000)]
lavu: 256 color support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 7 Jul 2012 00:17:30 +0000 (02:17 +0200)]
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>