ffmpeg.git
8 years agooutput-example: create @file doxy from text in the copyright header
Stefano Sabatini [Mon, 30 May 2011 07:12:48 +0000 (09:12 +0200)]
output-example: create @file doxy from text in the copyright header

8 years agoexamples: move API examples to a dedicated dir in doc
Stefano Sabatini [Sun, 29 May 2011 10:47:40 +0000 (12:47 +0200)]
examples: move API examples to a dedicated dir in doc

8 years agoffmpeg: simplify opt_*_codec() options
Stefano Sabatini [Sun, 29 May 2011 08:42:44 +0000 (10:42 +0200)]
ffmpeg: simplify opt_*_codec() options

Replace opt_{audio,video,subtitle,data}_codec() with a single
opt_codec() function.

8 years agov4l2: rewrite code iterating the supported standards
Stefano Sabatini [Sat, 28 May 2011 19:14:06 +0000 (21:14 +0200)]
v4l2: rewrite code iterating the supported standards

Simplify/clarify the code logic and error reporting.

8 years agov4l2: perform minor style fixes
Stefano Sabatini [Sat, 28 May 2011 19:04:29 +0000 (21:04 +0200)]
v4l2: perform minor style fixes

8 years agov4l2: replace memset() with explicit struct initialization
Stefano Sabatini [Sat, 28 May 2011 19:02:14 +0000 (21:02 +0200)]
v4l2: replace memset() with explicit struct initialization

8 years agorawdec: fail in case of unknow pixel format
Stefano Sabatini [Sun, 29 May 2011 23:42:45 +0000 (01:42 +0200)]
rawdec: fail in case of unknow pixel format

8 years agoswscale: remove sws_format_name()
Stefano Sabatini [Sun, 29 May 2011 15:57:40 +0000 (17:57 +0200)]
swscale: remove sws_format_name()

Use av_get_pix_fmt_name() instead.

8 years agoerror.c: fix compile flags
Michael Niedermayer [Mon, 30 May 2011 01:11:54 +0000 (03:11 +0200)]
error.c: fix compile flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoTCP: change default timeout to 5sec
Michael Niedermayer [Mon, 30 May 2011 00:39:26 +0000 (02:39 +0200)]
TCP: change default timeout to 5sec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "Timeout TCP open() after 5 seconds."
Michael Niedermayer [Mon, 30 May 2011 00:36:49 +0000 (02:36 +0200)]
Revert "Timeout TCP open() after 5 seconds."

This code is redundant and conflicts with lucas reimplementation of it.

This reverts commit a2f5e14a867768019b49b830e29801f1bfb2abb7.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 29 May 2011 23:23:11 +0000 (01:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: enable UAL syntax in asm.S
  v4l2: don't leak video standard string on error.
  swscale: Remove disabled code.
  avfilter: Surround function only used in debug mode by appropriate #ifdef.
  vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
  build: remove BUILD_ROOT variable
  vp8: use av_clip_uintp2() where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix various unused variable warnings
Clément Bœsch [Sun, 29 May 2011 19:07:34 +0000 (21:07 +0200)]
Fix various unused variable warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix various bad printf format warnings
Clément Bœsch [Sun, 29 May 2011 19:07:35 +0000 (21:07 +0200)]
Fix various bad printf format warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoARM: enable UAL syntax in asm.S
Mans Rullgard [Sun, 29 May 2011 13:22:52 +0000 (14:22 +0100)]
ARM: enable UAL syntax in asm.S

This enables UAL syntax for all asm files instead of only those
which happen to be incompatible with the old, deprecated syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoRemove now unused nb_istreams variable.
Reimar Döffinger [Sun, 29 May 2011 13:31:20 +0000 (15:31 +0200)]
Remove now unused nb_istreams variable.

8 years agoAdd const to vector types for input in altivec code.
Reimar Döffinger [Sun, 29 May 2011 13:25:17 +0000 (15:25 +0200)]
Add const to vector types for input in altivec code.

Avoids a large amount of warnings about cast discarding qualifiers.

8 years agoRemove unused variable, avoiding compiler warning.
Reimar Döffinger [Sun, 29 May 2011 13:23:28 +0000 (15:23 +0200)]
Remove unused variable, avoiding compiler warning.

8 years agoCast pointers to uintptr_t rather than unsigned int.
Reimar Döffinger [Sun, 29 May 2011 13:22:15 +0000 (15:22 +0200)]
Cast pointers to uintptr_t rather than unsigned int.

Avoids potential warnings on PPC64 systems.

8 years agov4l2: don't leak video standard string on error.
Anton Khirnov [Fri, 27 May 2011 07:32:17 +0000 (09:32 +0200)]
v4l2: don't leak video standard string on error.

8 years agoswscale: Remove disabled code.
Diego Biurrun [Fri, 29 Apr 2011 17:35:08 +0000 (19:35 +0200)]
swscale: Remove disabled code.

8 years agoavfilter: Surround function only used in debug mode by appropriate #ifdef.
Diego Biurrun [Fri, 27 May 2011 18:24:44 +0000 (20:24 +0200)]
avfilter: Surround function only used in debug mode by appropriate #ifdef.

This fixes the warning:
libavfilter/avfilter.c:219: warning: ‘ff_get_ref_perms_string’ defined but not used

8 years agovf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
Diego Biurrun [Fri, 27 May 2011 18:22:55 +0000 (20:22 +0200)]
vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().

8 years agobuild: remove BUILD_ROOT variable
Mans Rullgard [Sat, 28 May 2011 12:10:01 +0000 (13:10 +0100)]
build: remove BUILD_ROOT variable

This variable is unnecessary as absolute paths are not required.

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

* qatar/master: (27 commits)
  ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
  ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
  ac3dsp: fix loop condition in ac3_update_bap_counts_c()
  ARM: unbreak build
  ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
  ac3enc: split mantissa bit counting into a separate function.
  ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
  get_bits: add av_unused tag to cache variable
  sws: replace all long with int.
  ARM: aacdec: fix constraints on inline asm
  ARM: remove unnecessary volatile from inline asm
  ARM: add "cc" clobbers to inline asm where needed
  ARM: improve FASTDIV asm
  ac3enc: use LOCAL_ALIGNED macro
  APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
  lavu: add av_get_pix_fmt_name() convenience function
  cmdutils: remove OPT_FUNC2
  swscale: fix crash in bilinear scaling.
  vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
  webm: support stereo videos in matroska/webm muxer
  ...

Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
doc/muxers.texi
ffmpeg.c
ffplay.c
libavcodec/ac3enc.c
libavcodec/ac3enc_float.c
libavcodec/avcodec.h
libavcodec/get_bits.h
libavcodec/libvpxenc.c
libavcodec/version.h
libavdevice/libdc1394.c
libavformat/matroskaenc.c
libavutil/avutil.h
libswscale/rgb2rgb.c
libswscale/swscale.c
libswscale/swscale_template.c
libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp8: use av_clip_uintp2() where possible
Mans Rullgard [Sat, 28 May 2011 16:20:49 +0000 (17:20 +0100)]
vp8: use av_clip_uintp2() where possible

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoswscale: Commits that could not be pulled earlier due to bugs #2
Michael Niedermayer [Fri, 27 May 2011 21:50:06 +0000 (23:50 +0200)]
swscale: Commits that could not be pulled earlier due to bugs #2

commit 5a5a0f161359ca6c3fd03eac88a57bd026b8bc1d
Author: Diego Biurrun <diego@biurrun.de>
Date:   Fri May 27 19:46:39 2011 +0200

    swscale: Remove unused variables in x86 code.

    libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’
    libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’
    libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’
    libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’

commit 389e2000ebc299b9da24f7e5faf9a68a88f9ee7c
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Fri May 27 12:23:32 2011 -0400

    swscale: delay allocation of formatConvBuffer().

    That means it won't be allocated when not needed. Alongside
    this, it fixes valgrind/fate-detected memory leaks.

commit f327bfa6dcdbce4593213c30a328d8aaf7a4b86b
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Fri May 27 11:36:43 2011 -0400

    swscale: fix build with --disable-swscale-alpha.

commit 9f5d45025e8df9d5f39832caad16b94cb6ac11c5
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Fri May 27 09:28:38 2011 -0400

    swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.

8 years agoCommits that could not be pulled earlier due to bugs.
Michael Niedermayer [Sat, 28 May 2011 13:52:50 +0000 (15:52 +0200)]
Commits that could not be pulled earlier due to bugs.

    commit 93681fbd5082a3af896b7a730dacdd27a3052406
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Thu May 26 11:32:32 2011 -0400

        swscale: fix compile on ppc.

    commit e758573a887cfb1155e81499ca54f433127cf24e
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Thu May 26 10:36:47 2011 -0400

        swscale: fix compile on x86-32.

    commit 0f4eb8b04341081591bf401eaa2c07d6bc3ff52e
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Thu May 26 09:17:52 2011 -0400

        swscale: remove VOF/VOFW.

    commit b4a224c5e4109cb2cca8bac38628673d685fe763
    Author: Ronald S. Bultje <rsbultje@gmail.com>
    Date:   Wed May 25 14:30:09 2011 -0400

        swscale: split chroma buffers into separate U/V planes.

        Preparatory step to implement support for sizes > VOFW.

8 years agoRevert 1a5e4fd8c5b99478b4e08a69261930bb12aa948b for postproc. This broke the code
Michael Niedermayer [Sat, 28 May 2011 22:11:39 +0000 (00:11 +0200)]
Revert 1a5e4fd8c5b99478b4e08a69261930bb12aa948b for postproc. This broke the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc: correct AC-3 option subsection placement
James Zern [Fri, 27 May 2011 23:31:59 +0000 (16:31 -0700)]
doc: correct AC-3 option subsection placement

Floating-Point-Only section was added after the video encoders chapter
in 034fc7b merge.

8 years agoac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
Mans Rullgard [Sat, 28 May 2011 19:27:09 +0000 (20:27 +0100)]
ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
Justin Ruggles [Sat, 28 May 2011 18:39:18 +0000 (14:39 -0400)]
ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.

this should fix the windows builds

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoswscale: use av_clip_uint8() in yuv2yuv1_c().
Ronald S. Bultje [Wed, 25 May 2011 19:28:12 +0000 (15:28 -0400)]
swscale: use av_clip_uint8() in yuv2yuv1_c().

8 years agoswscale: replace formatConvBuffer[VOF] by allocated array.
Ronald S. Bultje [Thu, 26 May 2011 13:15:38 +0000 (09:15 -0400)]
swscale: replace formatConvBuffer[VOF] by allocated array.

This allows to convert between formats of arbitrary width,
regardless of the value of VOF/VOFW.

8 years agov4l2: create file @doxy from text in the copyright header
Stefano Sabatini [Sat, 28 May 2011 18:59:27 +0000 (20:59 +0200)]
v4l2: create file @doxy from text in the copyright header

8 years agov4l2: remove pointless empty lines
Stefano Sabatini [Sat, 28 May 2011 18:58:32 +0000 (20:58 +0200)]
v4l2: remove pointless empty lines

8 years agov4l2: set default standard to NULL
Stefano Sabatini [Sat, 28 May 2011 18:47:17 +0000 (20:47 +0200)]
v4l2: set default standard to NULL

Avoid a failure with the default value of "NTSC". Not all drivers
support a standard.

8 years agov4l2: use OFFSET macro when setting options
Stefano Sabatini [Sat, 28 May 2011 18:38:06 +0000 (20:38 +0200)]
v4l2: use OFFSET macro when setting options

Improve readability.

8 years agoac3dsp: fix loop condition in ac3_update_bap_counts_c()
Justin Ruggles [Sat, 28 May 2011 18:40:16 +0000 (14:40 -0400)]
ac3dsp: fix loop condition in ac3_update_bap_counts_c()

8 years agoARM: unbreak build
Mans Rullgard [Sat, 28 May 2011 17:36:07 +0000 (18:36 +0100)]
ARM: unbreak build

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavdev: add SDL output device
Stefano Sabatini [Thu, 26 May 2011 23:34:35 +0000 (01:34 +0200)]
lavdev: add SDL output device

8 years agoac3enc: modify mantissa bit counting to keep bap counts for all values of bap
Justin Ruggles [Thu, 26 May 2011 19:53:25 +0000 (15:53 -0400)]
ac3enc: modify mantissa bit counting to keep bap counts for all values of bap
instead of just 0 to 4.

This does all the actual bit counting as a final step.

8 years agoac3enc: split mantissa bit counting into a separate function.
Justin Ruggles [Thu, 26 May 2011 16:31:31 +0000 (12:31 -0400)]
ac3enc: split mantissa bit counting into a separate function.

No speed difference. This is to allow for more flexible bit counting.

8 years agoac3enc: store per-block/channel bap pointers by reference block in a 2D array
Justin Ruggles [Thu, 26 May 2011 19:57:21 +0000 (15:57 -0400)]
ac3enc: store per-block/channel bap pointers by reference block in a 2D array
rather than in the AC3Block struct.

This will make it easier to access the bap values without having to chase
the reference block pointers each time.

8 years agolavu: add av_get_pix_fmt_name() convenience function
Stefano Sabatini [Thu, 26 May 2011 17:19:18 +0000 (19:19 +0200)]
lavu: add av_get_pix_fmt_name() convenience function

Also deprecate avcodec_get_pix_fmt_name() in its favor.

8 years agoiff: remove duplicated file description
Stefano Sabatini [Sat, 28 May 2011 08:50:11 +0000 (10:50 +0200)]
iff: remove duplicated file description

8 years agocmdutils: remove OPT_FUNC2
Stefano Sabatini [Tue, 24 May 2011 16:14:42 +0000 (18:14 +0200)]
cmdutils: remove OPT_FUNC2

Make ff* tools only accept opt_* functions taking two arguments.

The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.

8 years agoget_bits: add av_unused tag to cache variable
Mans Rullgard [Sat, 28 May 2011 14:46:55 +0000 (15:46 +0100)]
get_bits: add av_unused tag to cache variable

This silences numerous compiler warnings from skip_bits(),
where the cache variable is not used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosws: replace all long with int.
Anton Khirnov [Thu, 26 May 2011 16:57:26 +0000 (18:57 +0200)]
sws: replace all long with int.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoARM: aacdec: fix constraints on inline asm
Mans Rullgard [Fri, 27 May 2011 21:52:49 +0000 (22:52 +0100)]
ARM: aacdec: fix constraints on inline asm

This adds output operands for modified memory allowing the
volatile qualifiers to be dropped.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: remove unnecessary volatile from inline asm
Mans Rullgard [Fri, 27 May 2011 21:49:28 +0000 (22:49 +0100)]
ARM: remove unnecessary volatile from inline asm

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: add "cc" clobbers to inline asm where needed
Mans Rullgard [Fri, 27 May 2011 20:59:46 +0000 (21:59 +0100)]
ARM: add "cc" clobbers to inline asm where needed

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: improve FASTDIV asm
Mans Rullgard [Fri, 27 May 2011 20:43:15 +0000 (21:43 +0100)]
ARM: improve FASTDIV asm

This uses one register less.  Also add missing "cc" clobber.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoac3enc: use LOCAL_ALIGNED macro
Mans Rullgard [Fri, 27 May 2011 19:31:57 +0000 (20:31 +0100)]
ac3enc: use LOCAL_ALIGNED macro

Aligned local variables must use the LOCAL_ALIGNED macro to ensure
correct alignment on all systems.  The unusual size argument to
memset is required since the implementation of LOCAL_ALIGNED may
use a pointer to an array.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoAPIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
Ronald S. Bultje [Sat, 28 May 2011 13:46:42 +0000 (09:46 -0400)]
APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).

8 years agolavu: add av_get_pix_fmt_name() convenience function
Stefano Sabatini [Sat, 28 May 2011 00:39:20 +0000 (02:39 +0200)]
lavu: add av_get_pix_fmt_name() convenience function

Also deprecate avcodec_get_pix_fmt_name() in its favor.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agocmdutils: remove OPT_FUNC2
Stefano Sabatini [Fri, 27 May 2011 23:53:00 +0000 (01:53 +0200)]
cmdutils: remove OPT_FUNC2

Make ff* tools only accept opt_* functions taking two arguments.

The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoswscale: fix crash in bilinear scaling.
Ronald S. Bultje [Fri, 27 May 2011 23:01:47 +0000 (19:01 -0400)]
swscale: fix crash in bilinear scaling.

8 years agovpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
James Zern [Tue, 12 Apr 2011 02:40:47 +0000 (04:40 +0200)]
vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping

via the equivalent AVCodecContext::mb_threshold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agowebm: support stereo videos in matroska/webm muxer
Alok Ahuja [Sat, 28 May 2011 06:12:22 +0000 (08:12 +0200)]
webm: support stereo videos in matroska/webm muxer

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 agorgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
Ronald S. Bultje [Tue, 24 May 2011 22:28:40 +0000 (18:28 -0400)]
rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.

Many functions have such a prefix, but do not actually use any
instructions or features from that set, thus giving the false
impression that swscale is highly optimized for a particular
system, whereas in reality it is not.

8 years agoswscale: reindent h[cy]scale_fast() and updateDitherTables().
Ronald S. Bultje [Tue, 24 May 2011 21:50:03 +0000 (17:50 -0400)]
swscale: reindent h[cy]scale_fast() and updateDitherTables().

8 years agoswscale: reformat x86/swscale_template.c.
Ronald S. Bultje [Thu, 26 May 2011 13:11:29 +0000 (09:11 -0400)]
swscale: reformat x86/swscale_template.c.

Interleave macros and code so that it's easier to find the
actual code that belongs to a function. Also reindent where
appropriate and remove dead code.

8 years agoswscale: remove duplicate mmx/mmx2 functions if they are identical.
Ronald S. Bultje [Tue, 24 May 2011 20:45:41 +0000 (16:45 -0400)]
swscale: remove duplicate mmx/mmx2 functions if they are identical.

8 years agoswscale: remove if (c->dstFormat) branch from yuv2packed[12X]().
Ronald S. Bultje [Tue, 24 May 2011 20:02:47 +0000 (16:02 -0400)]
swscale: remove if (c->dstFormat) branch from yuv2packed[12X]().

This allows cutting up the function in much smaller and easier-
to-maintain chunks.

8 years agoswscale: remove if(full_chr_int) from yuv2packed1().
Ronald S. Bultje [Tue, 24 May 2011 19:18:40 +0000 (15:18 -0400)]
swscale: remove if(full_chr_int) from yuv2packed1().

If that flag is set, swScale() already proxies the call to
yuv2rgbXinC_full(). Therefore, this flag is never set when
yuv2packed1() is called.

8 years agoswscale: remove if(accurate_rnd) branch from functions.
Ronald S. Bultje [Tue, 24 May 2011 19:16:19 +0000 (15:16 -0400)]
swscale: remove if(accurate_rnd) branch from functions.

8 years agoswscale: revive SWS_CPU_CAPS until next major bump.
Anton Khirnov [Wed, 25 May 2011 19:47:31 +0000 (21:47 +0200)]
swscale: revive SWS_CPU_CAPS until next major bump.

8 years agoswscale: Remove commented-out printf cruft.
Diego Biurrun [Wed, 25 May 2011 23:40:56 +0000 (01:40 +0200)]
swscale: Remove commented-out printf cruft.

8 years agoExport PCR pid
Kieran Kunhya [Fri, 11 Mar 2011 12:39:55 +0000 (12:39 +0000)]
Export PCR pid

8 years agoExport more transport stream information.
Kieran Kunhya [Fri, 4 Mar 2011 19:22:09 +0000 (19:22 +0000)]
Export more transport stream information.

with minor addition to the comment by michael

8 years agoOutput MPEG-TS stream identifiers.
Kieran Kunhya [Fri, 4 Mar 2011 15:09:32 +0000 (15:09 +0000)]
Output MPEG-TS stream identifiers.

with changes by michael to simplify API

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 27 May 2011 21:47:05 +0000 (23:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (29 commits)
  ARM: disable ff_vector_fmul_vfp on VFPv3 systems
  ARM: check for VFPv3
  swscale: Remove unused variables in x86 code.
  doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.
  x86: Add appropriate ifdefs around certain AVX functions.
  cmdutils: use sws_freeContext() instead of av_freep().
  swscale: delay allocation of formatConvBuffer().
  swscale: fix build with --disable-swscale-alpha.
  movenc: Deprecate the global RTP hinting flag, use a private AVOption instead
  movenc: Add an AVClass for setting muxer specific options
  swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
  configure: report yasm/nasm presence properly
  tcp: make connect() timeout properly
  rawdec: factor video demuxer definitions into a macro.
  rtspdec: add initial_pause private option.
  lavf: deprecate AVFormatParameters.width/height.
  tty: add video_size private option.
  rawdec: add video_size private option.
  x11grab: add video_size private option.
  x11grab: factorize returning error codes.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf: deprecate AVFormatParameters.pix_fmt.
Anton Khirnov [Fri, 27 May 2011 05:38:49 +0000 (07:38 +0200)]
lavf: deprecate AVFormatParameters.pix_fmt.

8 years agorawdec: add a pixel_format private option.
Anton Khirnov [Tue, 24 May 2011 07:02:11 +0000 (09:02 +0200)]
rawdec: add a pixel_format private option.

8 years agov4l2: add a pixel_format private option.
Anton Khirnov [Tue, 24 May 2011 07:02:11 +0000 (09:02 +0200)]
v4l2: add a pixel_format private option.

8 years agolibdc1394: add a pixel_format private option.
Anton Khirnov [Tue, 24 May 2011 07:02:11 +0000 (09:02 +0200)]
libdc1394: add a pixel_format private option.

8 years agocosmetics: indentation and alignment after previous commit
Justin Ruggles [Tue, 24 May 2011 23:38:30 +0000 (19:38 -0400)]
cosmetics: indentation and alignment after previous commit

8 years agoac3enc: add support for E-AC-3 encoding.
Justin Ruggles [Tue, 24 May 2011 19:20:56 +0000 (15:20 -0400)]
ac3enc: add support for E-AC-3 encoding.

This adds basic stream format support and allows for arbitrary bit rates
rather than just those supported in AC-3.

8 years agoac3enc: Move AC-3 AVOptions array to a separate file to make it easier to
Justin Ruggles [Tue, 24 May 2011 19:14:36 +0000 (15:14 -0400)]
ac3enc: Move AC-3 AVOptions array to a separate file to make it easier to
use only selected options for the different AC-3 encoder types.

8 years agoARM: disable ff_vector_fmul_vfp on VFPv3 systems
Mans Rullgard [Fri, 27 May 2011 19:18:26 +0000 (20:18 +0100)]
ARM: disable ff_vector_fmul_vfp on VFPv3 systems

This function uses old-style vector operations deprecated in VFPv3.
Some implementations, e.g. Cortex-A9, support them only through
slow software emulation.  Cortex-A8 does have this functionality
in hardware, but as it also has NEON, this function is not used
there regardless.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: check for VFPv3
Mans Rullgard [Fri, 27 May 2011 19:12:01 +0000 (20:12 +0100)]
ARM: check for VFPv3

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoswscale: Remove unused variables in x86 code.
Diego Biurrun [Fri, 27 May 2011 17:46:39 +0000 (19:46 +0200)]
swscale: Remove unused variables in x86 code.

libswscale/x86/swscale_template.c:2072: warning: unused variable ‘canMMX2BeUsed’
libswscale/x86/swscale_template.c:2145: warning: unused variable ‘canMMX2BeUsed’
libswscale/x86/swscale_template.c:2209: warning: unused variable ‘chrVPixBuf’
libswscale/x86/swscale_template.c:2237: warning: unused variable ‘chrVSrcPtr’

8 years agodoc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.
Diego Biurrun [Thu, 26 May 2011 12:39:37 +0000 (14:39 +0200)]
doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.

8 years agox86: Add appropriate ifdefs around certain AVX functions.
Diego Biurrun [Fri, 27 May 2011 19:18:12 +0000 (21:18 +0200)]
x86: Add appropriate ifdefs around certain AVX functions.

nasm versions prior to 2.09 have trouble assembling some of our AVX code.
Protect these sections by preprocessor macros to allow compilation to pass.

8 years agocmdutils: use sws_freeContext() instead of av_freep().
Ronald S. Bultje [Fri, 27 May 2011 15:57:39 +0000 (11:57 -0400)]
cmdutils: use sws_freeContext() instead of av_freep().

av_freep(swsContext) will leak all memory potentially
allocated within the swsContext.

8 years agoswscale: delay allocation of formatConvBuffer().
Ronald S. Bultje [Fri, 27 May 2011 16:23:32 +0000 (12:23 -0400)]
swscale: delay allocation of formatConvBuffer().

That means it won't be allocated when not needed. Alongside
this, it fixes valgrind/fate-detected memory leaks.

8 years agoswscale: fix build with --disable-swscale-alpha.
Ronald S. Bultje [Fri, 27 May 2011 15:36:43 +0000 (11:36 -0400)]
swscale: fix build with --disable-swscale-alpha.

8 years agomovenc: Deprecate the global RTP hinting flag, use a private AVOption instead
Martin Storsjö [Fri, 20 May 2011 09:27:02 +0000 (12:27 +0300)]
movenc: Deprecate the global RTP hinting flag, use a private AVOption instead

Instead of -fflags rtphint, set -movflags rtphint instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomovenc: Add an AVClass for setting muxer specific options
Martin Storsjö [Sat, 21 May 2011 11:57:04 +0000 (14:57 +0300)]
movenc: Add an AVClass for setting muxer specific options

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibdc1394: choose best video mode and rate based on camera capabilities.
Martin Lambers [Thu, 26 May 2011 06:16:58 +0000 (08:16 +0200)]
libdc1394: choose best video mode and rate based on camera capabilities.

8 years agoRemove support for libdc1394 < 2.0.
Martin Lambers [Wed, 25 May 2011 09:28:30 +0000 (11:28 +0200)]
Remove support for libdc1394 < 2.0.

Versions >= 2.0 have been around for a very long time now.

8 years agoavopt: fix segfault
Michael Niedermayer [Fri, 27 May 2011 14:54:22 +0000 (16:54 +0200)]
avopt: fix segfault

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
Ronald S. Bultje [Fri, 27 May 2011 13:28:38 +0000 (09:28 -0400)]
swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.

8 years agoswscale: dont loose precission on RGB/BGR48 input, that is dont drop half the bits.
Michael Niedermayer [Fri, 27 May 2011 10:47:03 +0000 (12:47 +0200)]
swscale: dont loose precission on RGB/BGR48 input, that is dont drop half the bits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopatch checklist: suggest --disable-yasm test.
Michael Niedermayer [Fri, 27 May 2011 09:50:38 +0000 (11:50 +0200)]
patch checklist: suggest --disable-yasm test.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h
Stefano Sabatini [Thu, 26 May 2011 17:11:25 +0000 (19:11 +0200)]
lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

8 years agolavdev: include libavformat/avformat.h in avdevice.h
Stefano Sabatini [Fri, 27 May 2011 08:52:34 +0000 (10:52 +0200)]
lavdev: include libavformat/avformat.h in avdevice.h

The header is always required for files which directly deal with
devices, since libavdevice uses the AVFormat* structures defined in
avformat.h.

Avoid the need to explicitely add libavformat/avformat.h.

8 years agofate.txt: replace FATE rsync command with a make command
Stefano Sabatini [Thu, 26 May 2011 14:02:55 +0000 (16:02 +0200)]
fate.txt: replace FATE rsync command with a make command

Remove reference to the mplayerhq.hu rsync command, and replace it
with a reference to the make fate-rsync command.

rsync needs still to be enabled on mplayerhq.hu, and it is currently
not working. Also the fate-rsync Makefile target can be easily updated
without the need to keep the docs in synch.

8 years agoconfigure: report yasm/nasm presence properly
Luca Barbato [Thu, 26 May 2011 18:03:37 +0000 (20:03 +0200)]
configure: report yasm/nasm presence properly

If the secondary assembler is in use report the proper name