ffmpeg.git
8 years ago Merge remote-tracking branch 'ffmpeg-mt/master'
Michael Niedermayer [Sat, 21 May 2011 01:11:50 +0000 (03:11 +0200)]
Merge remote-tracking branch 'ffmpeg-mt/master'

    * ffmpeg-mt/master:
      Update todo.
      h264: add an assert that copied pictures are valid picture pointers
      valgrind-check: run with 1 and 3 threads
      h264: When decoding a packet with multiple PPS/SPS, don't start the next thread until all of them have been read
      Allow some pictures to be released earlier after 51ead6d2c40c5defdd211f435aec49b19f5f6a18
      h264: fix slice threading MC reading uninitialized frame edges.

    Please see ffmpeg-mt for a list of authors of these changes.

    Conflicts:
        libavcodec/h264.c
        mt-work/valgrind-check.sh

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd a flag to disable side data merging.
Michael Niedermayer [Sat, 21 May 2011 00:17:10 +0000 (02:17 +0200)]
Add a flag to disable side data merging.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge/split side data.
Michael Niedermayer [Wed, 20 Apr 2011 01:25:48 +0000 (03:25 +0200)]
Merge/split side data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoEncoding alac with more than two channels is not supported.
Carl Eugen Hoyos [Fri, 20 May 2011 23:11:42 +0000 (01:11 +0200)]
Encoding alac with more than two channels is not supported.

8 years agovf_libopencv: prefer opencv/cxcore.h over cxtypes.h
Stefano Sabatini [Fri, 20 May 2011 09:36:16 +0000 (11:36 +0200)]
vf_libopencv: prefer opencv/cxcore.h over cxtypes.h

Require the presence of opencv/cxcore.h in place of opencv/cxtypes.h,
which has been removed. Fix compilation with libopencv > 2.1.0.

Fix trac issue #221.

8 years agodecoders.texi: fix typos in rawvideo section
Stefano Sabatini [Fri, 20 May 2011 08:12:42 +0000 (10:12 +0200)]
decoders.texi: fix typos in rawvideo section

8 years agocmdutils: use const AVClass * when senseful
Stefano Sabatini [Thu, 19 May 2011 19:41:50 +0000 (21:41 +0200)]
cmdutils: use const AVClass * when senseful

Fix warnings:
cmdutils.c: In function ‘opt_default’:
cmdutils.c:304: warning: initialization discards qualifiers from pointer target type
cmdutils.c: In function ‘set_context_opts’:
cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type
cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’

8 years agoencoders.texi: add documentation for the libx264 encoder
Stefano Sabatini [Thu, 19 May 2011 19:14:37 +0000 (21:14 +0200)]
encoders.texi: add documentation for the libx264 encoder

Also remove -x264opts item from the ffmpeg manual, since it belongs to
the encoders section.

8 years agodecoders.texi: add documentation for rawvideo decoder and options
Stefano Sabatini [Thu, 19 May 2011 18:51:28 +0000 (20:51 +0200)]
decoders.texi: add documentation for rawvideo decoder and options

8 years agodoc: add decoders.texi file
Stefano Sabatini [Thu, 19 May 2011 18:34:56 +0000 (20:34 +0200)]
doc: add decoders.texi file

8 years agoencoders.texi: decrease level for audio encoders section
Stefano Sabatini [Thu, 19 May 2011 17:41:19 +0000 (19:41 +0200)]
encoders.texi: decrease level for audio encoders section

Make Audio Encoders a separate chapter, and decrese the contained
sections level by one.

Improve rendering, and improve consistency with the other parts of the
manual.

8 years agoffprobe.texi: remove inclusion of muxers section
Stefano Sabatini [Thu, 19 May 2011 19:14:09 +0000 (21:14 +0200)]
ffprobe.texi: remove inclusion of muxers section

Muxers are not used by ffprobe.

8 years agoindeo3: release buffer in indeo3_decode_end()
Stefano Sabatini [Tue, 17 May 2011 11:01:21 +0000 (13:01 +0200)]
indeo3: release buffer in indeo3_decode_end()

Fix leak.

8 years agoindeo3: remove unnecessary includes
Stefano Sabatini [Tue, 17 May 2011 18:25:06 +0000 (20:25 +0200)]
indeo3: remove unnecessary includes

8 years agoindeo3: add @file doxy and a link to multimedia wiki documentation
Stefano Sabatini [Tue, 17 May 2011 18:22:48 +0000 (20:22 +0200)]
indeo3: add @file doxy and a link to multimedia wiki documentation

8 years agocmdutils: reset *picref_ptr to NULL in get_filtered_frame()
Stefano Sabatini [Thu, 19 May 2011 22:58:00 +0000 (00:58 +0200)]
cmdutils: reset *picref_ptr to NULL in get_filtered_frame()

Avoid the presence of an invalid pointer, fix a crash in case of
get_filtered_frame() failure.

8 years agoffmpeg: remove useless NULL-check on avfilter_unref_buffer
Stefano Sabatini [Thu, 19 May 2011 17:01:38 +0000 (19:01 +0200)]
ffmpeg: remove useless NULL-check on avfilter_unref_buffer

The check is no more required since recent changes in the
avfilter_unref_buffer(), the check is done in the function.
Simplify.

8 years agolibmp3lame: include "libavutil/intreadwrite.h" header
Stefano Sabatini [Fri, 20 May 2011 07:33:57 +0000 (09:33 +0200)]
libmp3lame: include "libavutil/intreadwrite.h" header

Fix compilation.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 20 May 2011 03:42:04 +0000 (05:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: Use floating point synthesis filter.
  h264: correct border check.
  h264: fix loopfilter with threading at slice boundaries.
  Fix ff_mpa_synth_filter_fixed() prototype
  Rename costablegen.c ---> cos_tablegen.c.
  Collapse tableprint.c into tableprint.h.
  Simplify trig table rules
  Remove potentially unstable filenames from comments in generated files.
  Ignore generated tables and generated table generator programs.
  Simplify CLEANFILES make variable by using wildcards.
  Remove silly insults from avformat_version() Doxygen documentation.
  mpegaudiodsp: fix x86 and ppc makefiles
  configure: Adjust AVX assembler check.
  mpegaudio: remove unused version of SAME_HEADER_MASK
  mpegaudio: remove useless #undef at end of file
  asfdec: add missing #include for av_bswap32()
  mpegaudio: merge two #if CONFIG_FLOAT blocks
  mpegaudio: move some struct definitions from mpegaudio.h
  Move some mpegaudio functions to new mpegaudiodsp subsystem

Conflicts:
libavcodec/h264.c
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqdm2: Use floating point synthesis filter.
Vitor Sessak [Thu, 19 May 2011 19:33:27 +0000 (21:33 +0200)]
qdm2: Use floating point synthesis filter.

This avoid needlessly convertion from floating point to fixed point and back.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoh264: correct border check.
Ronald S. Bultje [Thu, 19 May 2011 20:47:59 +0000 (16:47 -0400)]
h264: correct border check.

When backing up the top-left border, check that the top-left
(rather than left) MB indeed does belong to our slice. If it
doesn't, backing up has no positive effect but may accidentally
interfere with other threads writing in the same space.

Fixes occasional one-off effects when enabling slice-MT.

8 years agoh264: fix loopfilter with threading at slice boundaries.
Ronald S. Bultje [Wed, 18 May 2011 12:10:49 +0000 (08:10 -0400)]
h264: fix loopfilter with threading at slice boundaries.

8 years agoFix ff_mpa_synth_filter_fixed() prototype
Mans Rullgard [Thu, 19 May 2011 19:46:24 +0000 (20:46 +0100)]
Fix ff_mpa_synth_filter_fixed() prototype

The prototype should use the same typedefs as the definition, or it
will fail where int32_t is not int (DOS apparently).

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoReindent
Martin Storsjö [Wed, 18 May 2011 13:21:50 +0000 (16:21 +0300)]
Reindent

8 years agortpenc_chain: Pass the MP4A_LATM flag to chained muxers
Martin Storsjö [Wed, 18 May 2011 13:21:49 +0000 (16:21 +0300)]
rtpenc_chain: Pass the MP4A_LATM flag to chained muxers

8 years agortpenc: MP4A-LATM payload support
Juan Carlos Rodriguez [Wed, 18 May 2011 13:21:48 +0000 (16:21 +0300)]
rtpenc: MP4A-LATM payload support

8 years agomovenc: Pass AVFormatContext flags to the SDP generation
Martin Storsjö [Wed, 18 May 2011 13:21:47 +0000 (16:21 +0300)]
movenc: Pass AVFormatContext flags to the SDP generation

8 years agosdp: Allow passing AVFormatContext flags to the SDP generation
Martin Storsjö [Wed, 18 May 2011 13:21:46 +0000 (16:21 +0300)]
sdp: Allow passing AVFormatContext flags to the SDP generation

8 years agovsrc_buffer: document av_vsrc_buffer_add_video_buffer_ref()
Stefano Sabatini [Thu, 19 May 2011 10:01:25 +0000 (12:01 +0200)]
vsrc_buffer: document av_vsrc_buffer_add_video_buffer_ref()

8 years agovsrc_buffer: add av_vsrc_buffer_add_frame()
Stefano Sabatini [Wed, 18 May 2011 23:17:16 +0000 (01:17 +0200)]
vsrc_buffer: add av_vsrc_buffer_add_frame()

The new function is a wrapper around
av_vsrc_buffer_add_video_buffer_ref(), and allows to simplify the act
of pushing AVFrame data to the source buffer.

8 years agovsrc_buffer: fix example in docs, add mandatory parameters
Stefano Sabatini [Thu, 19 May 2011 20:51:28 +0000 (22:51 +0200)]
vsrc_buffer: fix example in docs, add mandatory parameters

8 years agovsrc_buffer: make the source accept sws_param in init
Stefano Sabatini [Wed, 18 May 2011 23:02:54 +0000 (01:02 +0200)]
vsrc_buffer: make the source accept sws_param in init

Avoid the need of two distinct av_vsrc_add_video_buffer_ref*
functions. Simplify the interface.

8 years agovsrc_buffer: propagate avfilter_open() error code
Stefano Sabatini [Fri, 13 May 2011 16:09:47 +0000 (18:09 +0200)]
vsrc_buffer: propagate avfilter_open() error code

8 years agovsrc_buffer: fix style
Stefano Sabatini [Fri, 13 May 2011 16:07:51 +0000 (18:07 +0200)]
vsrc_buffer: fix style

8 years agolavfi: add avfilter_get_video_buffer_ref_from_frame to avcodec.h
Stefano Sabatini [Sat, 14 May 2011 09:46:14 +0000 (11:46 +0200)]
lavfi: add avfilter_get_video_buffer_ref_from_frame to avcodec.h

Simplify passing AVFrame data to av_vsrc_buffer_add_video_buffer_ref().

8 years agovsrc_buffer: remove dependency on AVFrame
Stefano Sabatini [Sat, 7 May 2011 19:35:08 +0000 (21:35 +0200)]
vsrc_buffer: remove dependency on AVFrame

Rename av_vsrc_buffer_add_frame to
av_vsrc_buffer_add_video_buffer_ref(), and change its inteface to make
it accept in input an AVFilterBufferRef rather than an AVFrame.

This way the interface can be used without requiring the
inclusion/installation of libavcodec headers.

8 years agoRename costablegen.c ---> cos_tablegen.c.
Diego Biurrun [Sun, 15 May 2011 22:53:07 +0000 (00:53 +0200)]
Rename costablegen.c ---> cos_tablegen.c.

This is consistent with how all other table generation programs are named.
Moreover this ensures that the cos table generation program is correctly
deleted when cleaning the tree.

8 years agoCollapse tableprint.c into tableprint.h.
Diego Biurrun [Thu, 19 May 2011 17:22:41 +0000 (19:22 +0200)]
Collapse tableprint.c into tableprint.h.

tableprint.c serves little purpose on its own and removing it allows building
the table generator programs with the normal HOSTPROGS Makefile rules.

8 years agoSimplify trig table rules
Mans Rullgard [Thu, 19 May 2011 17:34:40 +0000 (18:34 +0100)]
Simplify trig table rules

This collapses the make rules for the trig tables into a pattern
rule.  Based on a patch by Diego, modified to avoid using fragile
make constructs and allow future addition of fixed-point sin tables.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoRemove potentially unstable filenames from comments in generated files.
Diego Biurrun [Thu, 19 May 2011 16:12:17 +0000 (18:12 +0200)]
Remove potentially unstable filenames from comments in generated files.

8 years agoIgnore generated tables and generated table generator programs.
Diego Biurrun [Sun, 15 May 2011 22:59:50 +0000 (00:59 +0200)]
Ignore generated tables and generated table generator programs.

8 years agoSimplify CLEANFILES make variable by using wildcards.
Diego Biurrun [Sun, 15 May 2011 22:54:36 +0000 (00:54 +0200)]
Simplify CLEANFILES make variable by using wildcards.

Also ensures that generated file cos_fixed_tables.c is deleted on 'make clean'.

8 years agoRemove silly insults from avformat_version() Doxygen documentation.
Diego Biurrun [Thu, 19 May 2011 15:39:50 +0000 (17:39 +0200)]
Remove silly insults from avformat_version() Doxygen documentation.

8 years agompegaudiodsp: fix x86 and ppc makefiles
Mans Rullgard [Thu, 19 May 2011 15:26:39 +0000 (16:26 +0100)]
mpegaudiodsp: fix x86 and ppc makefiles

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoconfigure: Adjust AVX assembler check.
Diego Biurrun [Mon, 16 May 2011 12:23:59 +0000 (14:23 +0200)]
configure: Adjust AVX assembler check.

Older nasm versions have trouble assembling certain AVX instructions, but the
current AVX check did not detect this. Update the check to use an instruction
that triggers the nasm problem.

8 years agompegaudio: remove unused version of SAME_HEADER_MASK
Mans Rullgard [Thu, 19 May 2011 13:01:11 +0000 (14:01 +0100)]
mpegaudio: remove unused version of SAME_HEADER_MASK

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegaudio: remove useless #undef at end of file
Mans Rullgard [Thu, 19 May 2011 11:48:33 +0000 (12:48 +0100)]
mpegaudio: remove useless #undef at end of file

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoasfdec: add missing #include for av_bswap32()
Mans Rullgard [Thu, 19 May 2011 11:31:05 +0000 (12:31 +0100)]
asfdec: add missing #include for av_bswap32()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegaudio: merge two #if CONFIG_FLOAT blocks
Mans Rullgard [Mon, 16 May 2011 17:59:25 +0000 (18:59 +0100)]
mpegaudio: merge two #if CONFIG_FLOAT blocks

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegaudio: move some struct definitions from mpegaudio.h
Mans Rullgard [Tue, 17 May 2011 13:22:25 +0000 (14:22 +0100)]
mpegaudio: move some struct definitions from mpegaudio.h

These structs are only used in mpegaudiodec.c, so move them there
and remove no longer needed #include lines from mpegaudio.h.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoMove some mpegaudio functions to new mpegaudiodsp subsystem
Mans Rullgard [Mon, 16 May 2011 15:52:01 +0000 (16:52 +0100)]
Move some mpegaudio functions to new mpegaudiodsp subsystem

This separation allows these functions to be used in a cleaner
fashion from other codecs (e.g. qdm2) and simplifies creating
optimised versions of them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 May 2011 11:00:31 +0000 (13:00 +0200)]
Merge remote-tracking branch 'qatar/master'

This early morning merge should fix --disable-yasm

* qatar/master:
  Clean up #includes in cmdutils.h.
  g729: Merge g729.h into g729dec.c.
  10l: wrap float_interleave functions in HAVE_YASM.

Conflicts:
libavcodec/g729.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoClean up #includes in cmdutils.h.
Diego Biurrun [Sun, 15 May 2011 15:09:25 +0000 (17:09 +0200)]
Clean up #includes in cmdutils.h.

inttypes.h is not necessary, just stdint.h is enough.
Unconditionally #include avfilter.h in cmdutils.h.  It is an installed
header with no non-standard external dependencies, so it is safe.

8 years agog729: Merge g729.h into g729dec.c.
Diego Biurrun [Tue, 17 May 2011 13:29:58 +0000 (15:29 +0200)]
g729: Merge g729.h into g729dec.c.

The header contains just a single define that is only used in g729dec.c.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 May 2011 03:12:45 +0000 (05:12 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
libavcodec/aacdec.c
libavcodec/ac3dec.c
libavcodec/avcodec.h
libavcodec/dca.c
libavcodec/h264.c
libavcodec/mdec.c
libavcodec/mpeg12.c
libavcodec/options.c
libavcodec/version.h
libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_find_stream_info: Print more details about max anaylize duration failures.
Michael Niedermayer [Wed, 18 May 2011 19:39:22 +0000 (21:39 +0200)]
av_find_stream_info: Print more details about max anaylize duration failures.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years ago10l: wrap float_interleave functions in HAVE_YASM.
Justin Ruggles [Thu, 19 May 2011 00:18:08 +0000 (20:18 -0400)]
10l: wrap float_interleave functions in HAVE_YASM.

fixes compilation with --disable-yasm

8 years agoAdd little description for -rc_override
Etienne Buira [Wed, 18 May 2011 16:54:42 +0000 (18:54 +0200)]
Add little description for -rc_override

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAPIchanges: fill in date and commit for request_sample_fmt
Justin Ruggles [Wed, 18 May 2011 21:52:31 +0000 (17:52 -0400)]
APIchanges: fill in date and commit for request_sample_fmt

8 years agoAdd floating-point sample format support to the ac3, eac3, dca, aac, and vorbis
Justin Ruggles [Sat, 23 Apr 2011 01:30:19 +0000 (21:30 -0400)]
Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis
decoders.

Based on patches by clsid2 in ffdshow-tryout.

8 years agoAdd support for request_sample_format in ffmpeg and ffplay.
Justin Ruggles [Sun, 24 Apr 2011 20:48:42 +0000 (16:48 -0400)]
Add support for request_sample_format in ffmpeg and ffplay.

8 years agoAdd APIchanges entry for request_sample_fmt.
Justin Ruggles [Thu, 21 Apr 2011 14:48:05 +0000 (10:48 -0400)]
Add APIchanges entry for request_sample_fmt.

8 years agoAdd request_sample_fmt field to AVCodecContext.
Justin Ruggles [Tue, 19 Apr 2011 23:47:01 +0000 (19:47 -0400)]
Add request_sample_fmt field to AVCodecContext.

This will allow audio decoders to support output of different sample formats
as a runtime option.

8 years agoAdd float_interleave() to FmtConvertContext with x86-optimized versions.
Justin Ruggles [Sun, 24 Apr 2011 21:50:17 +0000 (17:50 -0400)]
Add float_interleave() to FmtConvertContext with x86-optimized versions.

Partially based on patches by clsid2 in ffdshow-tryout.
ff_float_interleave6() x86 improvements by Loren Merrit.

8 years agoRemove unused make variable SEEK_REFFILE
Mans Rullgard [Wed, 18 May 2011 16:13:15 +0000 (17:13 +0100)]
Remove unused make variable SEEK_REFFILE

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: remove redundant aref and vref references
Mans Rullgard [Wed, 18 May 2011 16:23:47 +0000 (17:23 +0100)]
fate: remove redundant aref and vref references

The ref targets are included in the FATE_[AV]CODEC lists created
by configure so they do not need to be listed separately in the
makefile.  Filter them out when setting dependencies to avoid make
warnings about circular deps.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoParse 'bext' metadata in the wav demuxer
Tomas Härdin [Wed, 18 May 2011 11:48:39 +0000 (13:48 +0200)]
Parse 'bext' metadata in the wav demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCosmetics: indent
Tomas Härdin [Thu, 3 Mar 2011 15:41:11 +0000 (16:41 +0100)]
Cosmetics: indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoKeep parsing wav until EOF if the input is seekable and we know the size of the data tag
Tomas Härdin [Wed, 18 May 2011 11:48:02 +0000 (13:48 +0200)]
Keep parsing wav until EOF if the input is seekable and we know the size of the data tag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRefactor the tag checking into a switch statement
Tomas Härdin [Thu, 17 Feb 2011 14:58:10 +0000 (15:58 +0100)]
Refactor the tag checking into a switch statement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoUse avio_tell() instead of url_ftell()
Tomas Härdin [Wed, 18 May 2011 11:47:23 +0000 (13:47 +0200)]
Use avio_tell() instead of url_ftell()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoadd x264opts entry to docs
Compn [Wed, 18 May 2011 15:50:34 +0000 (11:50 -0400)]
add x264opts entry to docs

8 years agocleaned up the udp.c, removed some variables and an av_log
JULIAN GARDNER [Wed, 18 May 2011 14:51:20 +0000 (16:51 +0200)]
cleaned up the udp.c, removed some variables and an av_log

8 years agoconfigure: favor pkg_config over sdl_config
Michael Niedermayer [Wed, 18 May 2011 14:36:08 +0000 (16:36 +0200)]
configure: favor pkg_config over sdl_config

This fixes linking issues on ubuntu.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibx264: support passing arbitrary parameters.
Michael Niedermayer [Wed, 18 May 2011 13:39:40 +0000 (15:39 +0200)]
libx264: support passing arbitrary parameters.

Idea taken from mencoder. This should fix conflicts with presets as long as
the new system is used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: dont show_banner() on verbose<0
Michael Niedermayer [Wed, 18 May 2011 11:58:13 +0000 (13:58 +0200)]
ffmpeg: dont show_banner() on verbose<0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: remove do_ffmpeg_nocheck function
Mans Rullgard [Wed, 18 May 2011 14:13:58 +0000 (15:13 +0100)]
fate: remove do_ffmpeg_nocheck function

This function is essentially an alias for run_ffmpeg and is only
used in one place.  This patch removes the function and replaces
the call with the equivalent (simpler) run_ffmpeg call.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: do not collect -benchmark output
Mans Rullgard [Wed, 18 May 2011 14:05:26 +0000 (15:05 +0100)]
fate: do not collect -benchmark output

The old regtest scripts pass -benchmark and collect the utime values.
As these values are never used, this machinery can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegaudiodec: remove decode_end() function
Mans Rullgard [Mon, 16 May 2011 15:37:38 +0000 (16:37 +0100)]
mpegaudiodec: remove decode_end() function

This function is not needed since 721d6f2dc5 removed the DCT table
allocations for the configuration used here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: run aref and vref as regular tests
Mans Rullgard [Wed, 18 May 2011 12:05:39 +0000 (13:05 +0100)]
fate: run aref and vref as regular tests

These tests create reference files used for psnr calculation in
the other codec tests.  Treating them as (mostly) regular tests
simplifies the makefile and makes them visible in the fate reports.
The latter makes errors in these runs easier to identify.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegaudio: sanitise compute_antialias_* names
Mans Rullgard [Tue, 17 May 2011 19:39:09 +0000 (20:39 +0100)]
mpegaudio: sanitise compute_antialias_* names

This makes the compute_antialias functions use the same naming
convention as everything else.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompeg12: add slice-threading checks to slice-threading initializers.
Ronald S. Bultje [Tue, 17 May 2011 14:26:29 +0000 (10:26 -0400)]
mpeg12: add slice-threading checks to slice-threading initializers.

Fixes "make THREADS=2 THREAD_TYPE=1 fate-mpeg2-field-enc".

8 years agoh264: copy pixel_shift between slice threading contexts.
Ronald S. Bultje [Tue, 17 May 2011 14:26:30 +0000 (10:26 -0400)]
h264: copy pixel_shift between slice threading contexts.

Fixes "make THREADS=2 THREAD_TYPE=2
fate-h264-conformance-frext-pph10i3_panasonic_a".

8 years agomdec: enable frame-level multithreading.
Alexander Strange [Tue, 10 May 2011 15:29:09 +0000 (11:29 -0400)]
mdec: enable frame-level multithreading.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agomdec.c: fix overread.
Ronald S. Bultje [Tue, 10 May 2011 15:29:08 +0000 (11:29 -0400)]
mdec.c: fix overread.

8 years agoid3v2: prevent unsigned integer overflow in ff_id3v2_parse()
Stefano Sabatini [Tue, 17 May 2011 22:43:25 +0000 (00:43 +0200)]
id3v2: prevent unsigned integer overflow in ff_id3v2_parse()

In ff_id3v2_parse(), prevent unsigned integer overflow if data length
indicator is skipped and tlen is < 4.

Fix crash decoding file Allaby_cut.mp3, fix trac issue #182.

8 years agoid3v2: add @file doxy and link to format documentation
Stefano Sabatini [Tue, 17 May 2011 21:28:19 +0000 (23:28 +0200)]
id3v2: add @file doxy and link to format documentation

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 18 May 2011 03:42:42 +0000 (05:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fix compilation of iirfilter-test.
  libx264: handle closed GOP codec flag
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  flvdec: clenup debug code
  asfdec: fix possible overread on broken files.
  asfdec: do not fall back to binary/generic search
  asfdec: reindent after previous commit c7bd5ed
  asfdec: fallback to binary search internally
  mpegaudio: add _fixed suffix to some names
  Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
  dct: build dct32 as separate object files
  qdm2: include correct header for rdft

Conflicts:
ffpresets/libx264-fast.ffpreset
ffpresets/libx264-fast_firstpass.ffpreset
ffpresets/libx264-faster.ffpreset
ffpresets/libx264-faster_firstpass.ffpreset
ffpresets/libx264-medium.ffpreset
ffpresets/libx264-medium_firstpass.ffpreset
ffpresets/libx264-placebo.ffpreset
ffpresets/libx264-placebo_firstpass.ffpreset
ffpresets/libx264-slow.ffpreset
ffpresets/libx264-slow_firstpass.ffpreset
ffpresets/libx264-slower.ffpreset
ffpresets/libx264-slower_firstpass.ffpreset
ffpresets/libx264-superfast.ffpreset
ffpresets/libx264-superfast_firstpass.ffpreset
ffpresets/libx264-ultrafast.ffpreset
ffpresets/libx264-ultrafast_firstpass.ffpreset
ffpresets/libx264-veryfast.ffpreset
ffpresets/libx264-veryfast_firstpass.ffpreset
ffpresets/libx264-veryslow.ffpreset
ffpresets/libx264-veryslow_firstpass.ffpreset
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: opensolaris install is not compatible with ffmpeg, allow overriding it.
Michael Niedermayer [Tue, 17 May 2011 22:03:19 +0000 (00:03 +0200)]
configure: opensolaris install is not compatible with ffmpeg, allow overriding it.

ginstall works on opensolaris.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix compilation of iirfilter-test.
Justin Ruggles [Tue, 17 May 2011 22:06:51 +0000 (18:06 -0400)]
Fix compilation of iirfilter-test.

8 years agoeval: opensolaris strtod() cannot handle 0x1234
Michael Niedermayer [Tue, 17 May 2011 22:01:40 +0000 (00:01 +0200)]
eval: opensolaris strtod() cannot handle 0x1234

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibx264: handle closed GOP codec flag
Jindrich Makovicka [Tue, 10 May 2011 13:11:45 +0000 (15:11 +0200)]
libx264: handle closed GOP codec flag

Also update libx264 presets to keep closed gop as default.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavf: remove duplicate assignment in avformat_alloc_context.
Anton Khirnov [Fri, 29 Apr 2011 09:42:05 +0000 (11:42 +0200)]
lavf: remove duplicate assignment in avformat_alloc_context.

AVClass is already initialized in  avformat_get_context_defaults.

8 years agolavf: use designated initializers for AVClasses.
Anton Khirnov [Fri, 29 Apr 2011 09:30:02 +0000 (11:30 +0200)]
lavf: use designated initializers for AVClasses.

8 years agoMake sure neither data_size nor sample_count is negative
Tomas Härdin [Tue, 17 May 2011 17:52:36 +0000 (19:52 +0200)]
Make sure neither data_size nor sample_count is negative

8 years agoRefactor the 'fmt ' tag search and parsing
Tomas Härdin [Tue, 17 May 2011 17:46:08 +0000 (19:46 +0200)]
Refactor the 'fmt ' tag search and parsing

Moving the search and parsing of the 'fmt ' info the main loop of wav_read_header() allows tags that precede it to be parsed.
Creating wav_parse_fmt_tag() makes wav_read_header() easier to read.

8 years agoflvdec: clenup debug code
Alex Converse [Tue, 17 May 2011 19:49:42 +0000 (12:49 -0700)]
flvdec: clenup debug code

8 years agoasfdec: fix possible overread on broken files.
Uoti Urpala [Thu, 12 May 2011 14:20:27 +0000 (10:20 -0400)]
asfdec: fix possible overread on broken files.

8 years agoasfdec: do not fall back to binary/generic search
Vladimir Pantelic [Tue, 17 May 2011 15:30:05 +0000 (17:30 +0200)]
asfdec: do not fall back to binary/generic search

asf_read_seek() inside the asf demuxer already does the
right thing, it tries the index and if that fails it uses
binary search. If binary search is called from outside of asfdec.c
it will fail because the asf code cannot clean up after itself.
Therefore introduce AVFMT_NOBINSEARCH that prevents the seek
code to fallback to binary search and AVFMT_NOGENSEARCH that
prevents the seek code to fallback to generic search.

8 years agoasfdec: reindent after previous commit c7bd5ed
Vladimir Pantelic [Thu, 12 May 2011 08:26:32 +0000 (10:26 +0200)]
asfdec: reindent after previous commit c7bd5ed