ffmpeg.git
6 years agomovenc: Addtion of \251cmt field to udta
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>
6 years agoShow hyphen in codec tag.
Carl Eugen Hoyos [Mon, 9 Jul 2012 11:46:55 +0000 (13:46 +0200)]
Show hyphen in codec tag.

6 years agoexr: support for reading pixelAspectRatio
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>
6 years agotiffenc: PIX_FMT_YUV440P support
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>
6 years agosgidec: add CODEC_CAP_DR1
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>
6 years agosgidec: remove redundant argument from read_uncompressed_sgi()
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>
6 years agog723_1: add CODEC_CAP_DR1
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>
6 years agoexr: add CODEC_CAP_DR1
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>
6 years agodpx: add CODEC_CAP_DR1
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>
6 years agosgidec: fix off by 1 error that tested a sample too far for oob.
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>
6 years agosmush: properly flag audio packets
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>
6 years agopaf: properly flag video packets
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agolavf: limit "Adjusting PTS forward" code to video streams
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>
6 years agovf_settb: rename the file as f_settb.
Nicolas George [Sun, 8 Jul 2012 17:45:33 +0000 (19:45 +0200)]
vf_settb: rename the file as f_settb.

6 years agosettb: cosmetic: reindent vf_settb structure.
Nicolas George [Sun, 8 Jul 2012 17:43:34 +0000 (19:43 +0200)]
settb: cosmetic: reindent vf_settb structure.

6 years agolavfi: implement asettb filter.
Nicolas George [Sat, 23 Jun 2012 10:19:14 +0000 (12:19 +0200)]
lavfi: implement asettb filter.

6 years agompegaudioenc: use av_assert
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>
6 years agov4l2: use av_assert
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>
6 years agolavf/segment: sort options
Stefano Sabatini [Sun, 8 Jul 2012 15:38:24 +0000 (17:38 +0200)]
lavf/segment: sort options

6 years agolavf/segment: make use of av_parse_time() when parsing the -segment_time value
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.

6 years agodoc/muxers: sort options for the segment muxer
Stefano Sabatini [Sun, 8 Jul 2012 14:45:37 +0000 (16:45 +0200)]
doc/muxers: sort options for the segment muxer

6 years agolavf/segment: add segment_list_type option, extend format for the segment list file
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.

6 years agolavf/nutenc: provide meaningful error message and error code in case of invalid pts
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

6 years agofate: FLAC tests require SAMPLES.
Nicolas George [Sun, 8 Jul 2012 11:41:39 +0000 (13:41 +0200)]
fate: FLAC tests require SAMPLES.

6 years agovf_tinterlace: use av_assert
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>
6 years agolavfi: do not pass opaque field to init functions
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.

6 years agosanm: make use of dsputil
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>
6 years agoaacdec: correct "audio config changed" warning message
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>
6 years agolatm: fix initialization on some streams when no extradata is available
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>
6 years agocmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
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.

6 years agox86inc: put basicnop under ifdef to prevent compile failure.
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>
6 years agox86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
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).

6 years agoswr/x86: 16bit integer mix functions need SSE2 not SSE
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>
6 years agoid3v2: add a mimetype for bmp pictures.
Anton Khirnov [Fri, 6 Jul 2012 20:35:10 +0000 (22:35 +0200)]
id3v2: add a mimetype for bmp pictures.

6 years agoflacdec: be less strict when parsing attached 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.

6 years agoflacdec: don't create an attached picture stream until we have all information.
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.

6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agox86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros
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>
6 years agox86inc: try to put amdnop under ifdef to prevent compile failure
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>
6 years agovf_pp: dont pass NULL into pp, it would fail
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>
6 years agopp: check that the argument is not NULL as this is not supported
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>
6 years agomxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..).
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.

6 years agodoc: update mono to stereo workaround example
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>
6 years agotools/bisect: rename to tools/bisect-create
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>
6 years agotools/bisect: rename temporary file and add it to git ignore
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>
6 years agotool/bisect: add some magic to make the bisect tool be useable when its not part...
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>
6 years agovc1: implement frame interlaced b-frame header parsing
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>
6 years agolog: fix compilation failure on mingw due to reference to undefined set_color256
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>
6 years agocelp_math: use av_assert
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>
6 years agocabac: use av_assert
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>
6 years agolavu: 256 color support
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agotiffenc: PIX_FMT_GRAY8A support
Paul B Mahol [Fri, 6 Jul 2012 19:54:10 +0000 (19:54 +0000)]
tiffenc: PIX_FMT_GRAY8A support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotiffenc: PIX_FMT_GRAY16LE support
Paul B Mahol [Fri, 6 Jul 2012 02:02:15 +0000 (02:02 +0000)]
tiffenc: PIX_FMT_GRAY16LE support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotiffenc: merge common code
Paul B Mahol [Fri, 6 Jul 2012 02:00:32 +0000 (02:00 +0000)]
tiffenc: merge common code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotiffenc: use av_get_bits_per_pixel() to get bpp
Paul B Mahol [Fri, 6 Jul 2012 01:57:54 +0000 (01:57 +0000)]
tiffenc: use av_get_bits_per_pixel() to get bpp

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotiffenc: use av_pix_fmt_descriptors to set bpp_tab[]
Paul B Mahol [Fri, 6 Jul 2012 01:49:22 +0000 (01:49 +0000)]
tiffenc: use av_pix_fmt_descriptors to set bpp_tab[]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotiffenc: simplify calculation of bpp_tab_size
Paul B Mahol [Fri, 6 Jul 2012 01:44:03 +0000 (01:44 +0000)]
tiffenc: simplify calculation of bpp_tab_size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agox86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro
Martin Storsjö [Fri, 6 Jul 2012 07:53:43 +0000 (10:53 +0300)]
x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro

The SPLATB_REG macro already adds the 'd' suffix internally.

This fixes building on Win64, which has been broken since 878e66902.

This worked for unix, where r2 happened to be rdx in this case, which
with the first suffix rdxd was mapped to eax, and eaxd is defined back
to eax. On win64 however, r2 happened to be R8 in this case, and
R8d mapps to R8D just fine, but there's no mapping for R8Dd to anything.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: add functions for testing code fragments
Mans Rullgard [Wed, 4 Jul 2012 22:06:25 +0000 (23:06 +0100)]
configure: add functions for testing code fragments

This simplifies testing arbitrary code fragments within a function
body.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoffmpeg: poll filters even after -t limit.
Nicolas George [Thu, 5 Jul 2012 19:00:00 +0000 (21:00 +0200)]
ffmpeg: poll filters even after -t limit.

If not, frames can still arrive to the sink and accumulate.
The frames past recording time will be ignored in do_*_out.

6 years agoFix destination row striding in altivec_yuv2_bgr24.
Pavel Koshevoy [Thu, 5 Jul 2012 23:00:59 +0000 (17:00 -0600)]
Fix destination row striding in altivec_yuv2_bgr24.

Misaligned row artifacts showed up when a 624x352 frame was converted
to BGR24 format.  When advancing to the next row the destination linesize
was added to the last output pointer position which was not linesize aligned,
resulting in a distorted picture.

Signed-off-by: Pavel Koshevoy <pavel@apple.aragog.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocosmetics: various spelling fixes
Lou Logan [Thu, 5 Jul 2012 23:38:53 +0000 (15:38 -0800)]
cosmetics: various spelling fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_amix: avoid spurious EAGAIN.
Anton Khirnov [Thu, 5 Jul 2012 19:51:44 +0000 (21:51 +0200)]
af_amix: avoid spurious EAGAIN.

Input on/off state can change in request_samples(), which can result in
a state where only the first input is active. get_available_samples()
will then return 0, and request_frame() will fail with EAGAIN even
though there is data on the single active input.

Take this into account and check the number of active inputs again after
calling request_samples().

6 years agoaf_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.
Anton Khirnov [Thu, 5 Jul 2012 18:28:10 +0000 (20:28 +0200)]
af_amix: return AVERROR(EAGAIN) when request_frame didn't produce output.

0 should only be returned when there was at least one output frame.

6 years agoaf_amix: only consider negative return codes as errors.
Anton Khirnov [Wed, 4 Jul 2012 16:55:14 +0000 (18:55 +0200)]
af_amix: only consider negative return codes as errors.

6 years agoavconv: use only meaningful timestamps in start time check.
Anton Khirnov [Wed, 4 Jul 2012 00:56:38 +0000 (02:56 +0200)]
avconv: use only meaningful timestamps in start time check.

6 years agoavconv: fix the check for -ss as an output option.
Anton Khirnov [Wed, 4 Jul 2012 00:53:25 +0000 (02:53 +0200)]
avconv: fix the check for -ss as an output option.

start time is already substracted from the frame timestamp, so it needs
to be checked against 0, not start time.

6 years agodoc/indevs/iec61883: document requirements for iec61883 device
Georg Lippitsch [Thu, 5 Jul 2012 14:00:51 +0000 (16:00 +0200)]
doc/indevs/iec61883: document requirements for iec61883 device

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoconfigure: cleanup libiec61883 code, allow enabling via command line
Michael Niedermayer [Thu, 5 Jul 2012 12:02:53 +0000 (14:02 +0200)]
configure: cleanup libiec61883 code, allow enabling via command line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agomss3: add forgotten 'static' qualifier for private table
Kostya Shishkov [Fri, 6 Jul 2012 07:22:46 +0000 (09:22 +0200)]
mss3: add forgotten 'static' qualifier for private table

6 years agobmv: add CODEC_CAP_DR1
Paul B Mahol [Fri, 6 Jul 2012 01:16:40 +0000 (01:16 +0000)]
bmv: add CODEC_CAP_DR1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolpc: use default number of passes when lpc_passes is invalid
Michael Niedermayer [Fri, 6 Jul 2012 01:59:06 +0000 (03:59 +0200)]
lpc: use default number of passes when lpc_passes is invalid

Should fix valgrind failure (uninitialized vars)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotiffdec: PIX_FMT_GRAY16LE support
Paul B Mahol [Fri, 6 Jul 2012 01:09:19 +0000 (01:09 +0000)]
tiffdec: PIX_FMT_GRAY16LE support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc: fix shared build after dnxhd merge.
Nicolas George [Thu, 5 Jul 2012 22:49:09 +0000 (00:49 +0200)]
lavc: fix shared build after dnxhd merge.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoBlowfish: restructure/simplify code a bit.
Michael Niedermayer [Thu, 5 Jul 2012 23:37:44 +0000 (01:37 +0200)]
Blowfish: restructure/simplify code a bit.

Very slightly faster (2% or so)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoadd side data to indicate the amount of samples to skip at the begin and end
Michael Niedermayer [Wed, 4 Jul 2012 19:58:48 +0000 (21:58 +0200)]
add side data to indicate the amount of samples to skip at the begin and end

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Reveiwed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: increase fuzzyness for ac3 encode for 3dnow
Michael Niedermayer [Thu, 5 Jul 2012 20:28:37 +0000 (22:28 +0200)]
fate: increase fuzzyness for ac3 encode for 3dnow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopaf: add forgotten CODEC_CAP_DR1
Paul B Mahol [Fri, 6 Jul 2012 00:19:12 +0000 (00:19 +0000)]
paf: add forgotten CODEC_CAP_DR1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/buffersink: fix doxy, remove "video" reference
Stefano Sabatini [Thu, 5 Jul 2012 23:10:28 +0000 (01:10 +0200)]
lavfi/buffersink: fix doxy, remove "video" reference

The file contains the code for the audio buffersink as well.

6 years agolavc: options: add planar names for request_sample_fmt
Mans Rullgard [Fri, 29 Jun 2012 14:23:03 +0000 (15:23 +0100)]
lavc: options: add planar names for request_sample_fmt

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoflacdec: add planar output support
Mans Rullgard [Mon, 2 Jul 2012 23:29:30 +0000 (00:29 +0100)]
flacdec: add planar output support

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 5 Jul 2012 19:23:37 +0000 (21:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: remove broken and disabled dump_context() debug function
  x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros
  x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros
  x86inc: modify ALIGN to not generate long nops on i586
  x86: h264_intrapred: port to cpuflag macros
  avplay: update input filter pointer when the filtergraph is reset.
  avconv: fix parsing of -force_key_frames option.
  h264: use templates to avoid excessive inlining
  xtea: Make the count parameter match the documentation
  blowfish: Make the count parameter match the documentation
  mpegvideo: Don't use ff_mspel_motion() for vc1
  xtea: invert branch and loop precedence
  blowfish: invert branch and loop precedence
  flvdec: optionally trust the metadata
  avconv: Set audio filter time base to the sample rate
  vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too

Conflicts:
ffmpeg.c
ffplay.c
libavcodec/h264.c
libavcodec/mpegvideo_common.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflvdec: Treat all nellymoser versions as the same codec
Martin Storsjö [Thu, 5 Jul 2012 06:47:29 +0000 (09:47 +0300)]
flvdec: Treat all nellymoser versions as the same codec

This avoids creating new AVStreams for them when switching between
different variants of them, since we can handle changes between
different sample rates of nellymoser within the same stream.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge branch 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg
Michael Niedermayer [Thu, 5 Jul 2012 18:40:32 +0000 (20:40 +0200)]
Merge branch 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg

* 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg:
  mxfenc: support dnxhd codec
  mxfenc: support smpte dv codec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: print error on unsupported seperate color planes
Michael Niedermayer [Thu, 5 Jul 2012 17:12:09 +0000 (19:12 +0200)]
h264: print error on unsupported seperate color planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: remove broken and disabled dump_context() debug function
Diego Biurrun [Thu, 5 Jul 2012 11:20:57 +0000 (13:20 +0200)]
qdm2: remove broken and disabled dump_context() debug function

6 years agox86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros
Diego Biurrun [Wed, 4 Jul 2012 13:32:16 +0000 (15:32 +0200)]
x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros

6 years agox86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros
Loren Merritt [Wed, 4 Jul 2012 11:07:49 +0000 (11:07 +0000)]
x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agox86inc: modify ALIGN to not generate long nops on i586
Loren Merritt [Tue, 3 Jul 2012 17:51:43 +0000 (17:51 +0000)]
x86inc: modify ALIGN to not generate long nops on i586

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agox86: h264_intrapred: port to cpuflag macros
Diego Biurrun [Tue, 3 Jul 2012 23:07:42 +0000 (01:07 +0200)]
x86: h264_intrapred: port to cpuflag macros

6 years agoExtend -codecs output.
Carl Eugen Hoyos [Thu, 5 Jul 2012 14:46:19 +0000 (16:46 +0200)]
Extend -codecs output.

Allow to show different supported multi-threading methods for an
encoder/decoder pair.

Fixes ticket #1512

6 years agoswr/x86: 10l, missed some SSE2 instructions in code marked as SSE.
Michael Niedermayer [Thu, 5 Jul 2012 13:17:39 +0000 (15:17 +0200)]
swr/x86: 10l, missed some SSE2 instructions in code marked as SSE.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: dont blindly enable iec61883
Michael Niedermayer [Thu, 5 Jul 2012 11:42:25 +0000 (13:42 +0200)]
configure: dont blindly enable iec61883

This should fix a configure failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfenc: support dnxhd codec
Matthieu Bouron [Mon, 28 May 2012 22:45:41 +0000 (00:45 +0200)]
mxfenc: support dnxhd codec

6 years agomxfenc: support smpte dv codec
Matthieu Bouron [Sat, 26 May 2012 16:09:47 +0000 (18:09 +0200)]
mxfenc: support smpte dv codec

After some internal talks it seems the code is similar to what is in FFmbc
by Baptiste Coudurier; Baptiste accepted to relicense the similiar chunks
from GPL to LGPL.

6 years agoavplay: update input filter pointer when the filtergraph is reset.
Anton Khirnov [Wed, 4 Jul 2012 09:35:18 +0000 (11:35 +0200)]
avplay: update input filter pointer when the filtergraph is reset.

Fixes an invalid read on size change.

6 years agoavconv: fix parsing of -force_key_frames option.
Reimar Döffinger [Mon, 30 Apr 2012 20:48:42 +0000 (22:48 +0200)]
avconv: fix parsing of -force_key_frames option.

Currently it always exits with an error when more than
one position is specified.

CC: libav-stable@libav.org
6 years agoFireWire DV/HDV input device using libiec61883
Georg Lippitsch [Mon, 23 Apr 2012 14:01:17 +0000 (16:01 +0200)]
FireWire DV/HDV input device using libiec61883

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>