ffmpeg.git
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 May 2011 02:53:19 +0000 (04:53 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
Changelog
libavcodec/svq3.c
libavcodec/x86/dct32_sse.c
libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg2dec: Fix lowres 3
Michael Niedermayer [Sun, 22 May 2011 01:30:01 +0000 (03:30 +0200)]
mpeg2dec: Fix lowres 3

Fixes ticket212

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: bump minor and add changelog entry after the split filter addition
Stefano Sabatini [Sat, 21 May 2011 23:34:15 +0000 (01:34 +0200)]
lavfi: bump minor and add changelog entry after the split filter addition

8 years agovf_split: add documentation to filters.texi
Stefano Sabatini [Sat, 21 May 2011 23:32:40 +0000 (01:32 +0200)]
vf_split: add documentation to filters.texi

8 years agovf_split: give more meaningful names to the output pads
Stefano Sabatini [Sat, 21 May 2011 23:32:18 +0000 (01:32 +0200)]
vf_split: give more meaningful names to the output pads

Rename "default" -> "output1", "default2" -> output2.

8 years agovf_split: define draw_slice() before end_frame()
Stefano Sabatini [Sat, 21 May 2011 23:20:53 +0000 (01:20 +0200)]
vf_split: define draw_slice() before end_frame()

Improve logical coherence, fix nit.

8 years agovf_split: add description
Stefano Sabatini [Sat, 21 May 2011 23:19:20 +0000 (01:19 +0200)]
vf_split: add description

8 years agovf_split: fix various nits
Stefano Sabatini [Sat, 21 May 2011 23:18:59 +0000 (01:18 +0200)]
vf_split: fix various nits

8 years agowmadec: avoid infinit loop.
Michael Niedermayer [Sun, 22 May 2011 00:33:03 +0000 (02:33 +0200)]
wmadec: avoid infinit loop.

Fixes ticket183

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoDirectShow capture: Fix build
Ramiro Polla [Sat, 21 May 2011 19:53:15 +0000 (21:53 +0200)]
DirectShow capture: Fix build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: get rid of the -vglobal option.
Anton Khirnov [Sat, 21 May 2011 10:05:49 +0000 (12:05 +0200)]
ffmpeg: get rid of the -vglobal option.

It's badly documented and does the same thing as -flags global_header,
so it's redundant.

8 years agodct32: Add AVX implementation of 32-point DCT
Vitor Sessak [Sat, 14 May 2011 12:17:15 +0000 (14:17 +0200)]
dct32: Add AVX implementation of 32-point DCT

8 years agodct32: Change pass 6 permutation to allow for AVX implementation
Vitor Sessak [Sat, 14 May 2011 12:16:30 +0000 (14:16 +0200)]
dct32: Change pass 6 permutation to allow for AVX implementation

8 years agodct32: port SSE 32-point DCT to YASM
Vitor Sessak [Tue, 17 May 2011 16:26:01 +0000 (18:26 +0200)]
dct32: port SSE 32-point DCT to YASM

8 years agomatroska: switch stereo mode from int to string and add support in the demuxer too
Kirill Gavrilov [Sat, 21 May 2011 15:14:14 +0000 (17:14 +0200)]
matroska: switch stereo mode from int to string and add support in the demuxer too

8 years agomatroska: cosmetics
Kirill Gavrilov [Sat, 21 May 2011 15:08:53 +0000 (17:08 +0200)]
matroska: cosmetics

8 years agoCreate a stereo_mode metadata tag to specify the stereo 3d video layout using the...
Alok Ahuja [Sun, 24 Apr 2011 05:29:13 +0000 (22:29 -0700)]
Create a stereo_mode metadata tag to specify the stereo 3d video layout using the StereoMode tag in a matroska/webm video track.

8 years agolibavfilter: vf_split from soc.
Bobby Bingham [Sat, 21 May 2011 14:46:11 +0000 (16:46 +0200)]
libavfilter: vf_split from soc.

Commited by michael, for detailed authorship see soc repo

8 years agoDirectShow capture support
Ramiro Polla [Sat, 21 May 2011 12:24:50 +0000 (14:24 +0200)]
DirectShow capture support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomultiple inclusion guard cleanup
Diego Biurrun [Tue, 17 May 2011 14:58:04 +0000 (16:58 +0200)]
multiple inclusion guard cleanup

Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.

8 years agoavio: document buffer must created with av_malloc() and friends
Can Wu [Sat, 14 May 2011 09:34:28 +0000 (17:34 +0800)]
avio: document buffer must created with av_malloc() and friends

Else a later buffer resize in ffio_set_buf_size() will ABORT.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavio: check AVIOContext malloc failure
Can Wu [Sat, 14 May 2011 09:27:31 +0000 (17:27 +0800)]
avio: check AVIOContext malloc failure

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoswscale: point out an alternative to sws_getContext
Clément Bœsch [Thu, 5 May 2011 19:25:46 +0000 (21:25 +0200)]
swscale: point out an alternative to sws_getContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agosvq3: Do initialization after parsing the extradata
Ronald S. Bultje [Fri, 13 May 2011 07:24:31 +0000 (10:24 +0300)]
svq3: Do initialization after parsing the extradata

If done before, some parameters aren't known yet.

With svq3/rtp, initializing before some parameters are known
can lead to calling av_malloc(0), which on OS X currently returns
broken pointers.

8 years agoFix channel_layout documentation.
Carl Eugen Hoyos [Sat, 21 May 2011 09:08:44 +0000 (11:08 +0200)]
Fix channel_layout documentation.

libavformat/riff.c has been writing channel_layout for as long as
the field exists.

8 years agoadd changelog entries for 0.7_beta2
Reinhard Tartler [Thu, 12 May 2011 16:18:54 +0000 (18:18 +0200)]
add changelog entries for 0.7_beta2

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 May 2011 03:00:01 +0000 (05:00 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: make executable again
  LATM/AAC: Free previously initialized context on reinit.
  configure: Do not unconditionally add -Wall to host CFLAGS.
  configure: Set OS/2 objformat to a.out.
  Add support for a.out object format to assembler macros.
  fate: disable threading for encoding
  fate: add comment field
  fate: allow overriding default build and install dirs
  mpegtsenc: Add an AVClass pointer to the private data
  mpegaudio: clean up #includes
  mpegaudio: move all header parsing to mpegaudiodecheader.[ch]

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffserver: dont just crash
Mike William [Sat, 21 May 2011 02:50:59 +0000 (04:50 +0200)]
ffserver: dont just crash

With changes from ubitux.

8 years agofix ffserver's SIGSEGV
Maksym Veremeyenko [Sat, 21 May 2011 02:39:20 +0000 (04:39 +0200)]
fix ffserver's SIGSEGV

8 years agoavoptions: Support getting flag values using av_get_int
Martin Storsjö [Fri, 20 May 2011 11:59:47 +0000 (14:59 +0300)]
avoptions: Support getting flag values using av_get_int

8 years agopreset dir for win32
Gianluigi Tiesi [Sat, 21 May 2011 01:36:26 +0000 (03:36 +0200)]
preset dir for win32

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 agomp3lame: add #include required for AV_RB32 macro.
Ronald S. Bultje [Fri, 20 May 2011 18:56:44 +0000 (14:56 -0400)]
mp3lame: add #include required for AV_RB32 macro.

Fixes compilation with mp3lame enabled.

8 years agoconfigure: make executable again
Mans Rullgard [Fri, 20 May 2011 17:11:31 +0000 (18:11 +0100)]
configure: make executable again

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoLATM/AAC: Free previously initialized context on reinit.
Ronald S. Bultje [Fri, 20 May 2011 14:49:20 +0000 (10:49 -0400)]
LATM/AAC: Free previously initialized context on reinit.

Fixes memory leaks which are the result of overwriting already-initialized
MDCT contexts during context reinitialization, e.g. in valgrind
fate-aac-latm_000000001180bc60.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoconfigure: Do not unconditionally add -Wall to host CFLAGS.
Diego Biurrun [Mon, 16 May 2011 14:16:14 +0000 (16:16 +0200)]
configure: Do not unconditionally add -Wall to host CFLAGS.

Some compilers choke on -Wall, so only add the flag after checking it works.

8 years agoconfigure: Set OS/2 objformat to a.out.
Dave Yeo [Fri, 20 May 2011 15:26:52 +0000 (17:26 +0200)]
configure: Set OS/2 objformat to a.out.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoAdd support for a.out object format to assembler macros.
Dave Yeo [Fri, 20 May 2011 15:33:38 +0000 (17:33 +0200)]
Add support for a.out object format to assembler macros.

This format is still used by e.g. OS/2.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agofate: disable threading for encoding
Mans Rullgard [Fri, 20 May 2011 11:57:12 +0000 (12:57 +0100)]
fate: disable threading for encoding

This explicitly disables threading for encoding as slices are otherwise
automatically activated.  This should be dropped once option resetting
between files is fully implemented.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: add comment field
Mans Rullgard [Fri, 20 May 2011 11:47:42 +0000 (12:47 +0100)]
fate: add comment field

This adds a comment field to the report header, suitable for
extra information not covered by the automatic fields.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: allow overriding default build and install dirs
Mans Rullgard [Fri, 20 May 2011 11:06:51 +0000 (12:06 +0100)]
fate: allow overriding default build and install dirs

This is useful e.g. for building in a different filesystem than
where the source is kept.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegtsenc: Add an AVClass pointer to the private data
Martin Storsjö [Fri, 20 May 2011 08:33:57 +0000 (11:33 +0300)]
mpegtsenc: Add an AVClass pointer to the private data

Since a private class is set for this muxer, the callers will
assume that the private data starts with an AVClass pointer.
If no such member exists, the first few bytes of the struct
will be overwritten, and the class pointer may be broken at
any later time.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agompegaudio: clean up #includes
Mans Rullgard [Thu, 19 May 2011 12:27:24 +0000 (13:27 +0100)]
mpegaudio: clean up #includes

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agompegaudio: move all header parsing to mpegaudiodecheader.[ch]
Mans Rullgard [Thu, 19 May 2011 12:44:11 +0000 (13:44 +0100)]
mpegaudio: move all header parsing to mpegaudiodecheader.[ch]

Signed-off-by: Mans Rullgard <mans@mansr.com>
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