ffmpeg.git
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 agoFix memleak
Etienne Buira [Thu, 26 May 2011 19:02:50 +0000 (21:02 +0200)]
Fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix typo
Etienne Buira [Thu, 26 May 2011 19:00:37 +0000 (21:00 +0200)]
Fix typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove specific note when not specific
Etienne Buira [Thu, 26 May 2011 17:52:16 +0000 (19:52 +0200)]
Remove specific note when not specific

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMinor cleanup in libx264.c
Etienne Buira [Thu, 26 May 2011 17:48:59 +0000 (19:48 +0200)]
Minor cleanup in libx264.c

Not needed as overwritten later on (look for "// update AVCodecContext
with x264 parameters"), and not accessed inbetween.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd metadata conversion table to the wav demuxer
Tomas Härdin [Thu, 26 May 2011 07:29:03 +0000 (09:29 +0200)]
Add metadata conversion table to the wav demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 26 May 2011 23:47:34 +0000 (01:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (31 commits)
  ARM: add ARMv6 optimised av_clip_uintp2
  ARM: remove volatile from asm statements in libavutil/intmath
  ARM: fix av_clipl_int32_arm()
  v4l: include avdevice.h
  ffserver: move close_connection() call to avoid a temporary string and copy.
  lavf: initialize demuxer private options.
  AVOptions: set string default values.
  lavdevice: mark v4l for removal on next major bump.
  swscale: fix compile on ppc.
  swscale: fix compile on x86-32.
  build: Remove generated .version file on distclean.
  configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
  doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
  ffplay: Remove disabled code.
  Mark parameterless function declarations as 'void'.
  swscale: use av_clip_uint8() in yuv2yuv1_c().
  swscale: remove VOF/VOFW.
  swscale: split chroma buffers into separate U/V planes.
  swscale: replace formatConvBuffer[VOF] by allocated array.
  rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix 32bit rawvideo in avi on big-endian.
Carl Eugen Hoyos [Thu, 26 May 2011 21:49:17 +0000 (23:49 +0200)]
Fix 32bit rawvideo in avi on big-endian.

8 years agowebm: Additional options/presets for VP8 encodes under FFmpeg
James Zern [Thu, 26 May 2011 18:20:36 +0000 (20:20 +0200)]
webm: Additional options/presets for VP8 encodes under FFmpeg

8 years agomuxers: Add a flag to mark muxers that allow (non strict) monotone timestamps.
James Zern [Thu, 26 May 2011 18:19:04 +0000 (20:19 +0200)]
muxers: Add a flag to mark muxers that allow (non strict) monotone timestamps.

8 years agoswscale: Do not loose precission on yuv values after rgb->yuv.
Michael Niedermayer [Thu, 26 May 2011 13:32:33 +0000 (15:32 +0200)]
swscale: Do not loose precission on yuv values after rgb->yuv.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibx264: support aspect Ratio Switch
JULIAN GARDNER [Thu, 26 May 2011 13:32:14 +0000 (15:32 +0200)]
libx264: support aspect Ratio Switch

8 years agoARM: add ARMv6 optimised av_clip_uintp2
Mans Rullgard [Tue, 24 May 2011 14:46:28 +0000 (15:46 +0100)]
ARM: add ARMv6 optimised av_clip_uintp2

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: remove volatile from asm statements in libavutil/intmath
Mans Rullgard [Tue, 24 May 2011 14:45:50 +0000 (15:45 +0100)]
ARM: remove volatile from asm statements in libavutil/intmath

The volatile qualifiers are not needed on these statements as
their effects are fully specified by constraints.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: fix av_clipl_int32_arm()
Mans Rullgard [Wed, 25 May 2011 17:43:28 +0000 (18:43 +0100)]
ARM: fix av_clipl_int32_arm()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agov4l: include avdevice.h
Anton Khirnov [Thu, 26 May 2011 18:32:05 +0000 (20:32 +0200)]
v4l: include avdevice.h

Fixes build.

8 years agoffserver: move close_connection() call to avoid a temporary string and copy.
Mike Williams [Wed, 18 May 2011 13:14:22 +0000 (09:14 -0400)]
ffserver: move close_connection() call to avoid a temporary string and copy.

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavf: initialize demuxer private options.
Anton Khirnov [Thu, 26 May 2011 04:59:08 +0000 (06:59 +0200)]
lavf: initialize demuxer private options.

8 years agoAVOptions: set string default values.
Anton Khirnov [Thu, 26 May 2011 06:48:31 +0000 (08:48 +0200)]
AVOptions: set string default values.

8 years agoFix compilation with YASM/NASM versions not supporting AVX.
Reimar Döffinger [Thu, 26 May 2011 17:44:39 +0000 (19:44 +0200)]
Fix compilation with YASM/NASM versions not supporting AVX.

8 years agolavdevice: mark v4l for removal on next major bump.
Anton Khirnov [Thu, 26 May 2011 15:48:52 +0000 (17:48 +0200)]
lavdevice: mark v4l for removal on next major bump.

8 years agoswscale: fix compile on ppc.
Ronald S. Bultje [Thu, 26 May 2011 15:32:32 +0000 (11:32 -0400)]
swscale: fix compile on ppc.

8 years agoswscale: fix compile on x86-32.
Ronald S. Bultje [Thu, 26 May 2011 14:36:47 +0000 (10:36 -0400)]
swscale: fix compile on x86-32.

8 years agobuild: Remove generated .version file on distclean.
Diego Biurrun [Thu, 26 May 2011 13:48:31 +0000 (15:48 +0200)]
build: Remove generated .version file on distclean.

8 years agoconfigure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
Diego Biurrun [Thu, 26 May 2011 12:21:04 +0000 (14:21 +0200)]
configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.

The flag is required for some C99 math functions to be declared.

8 years agodoc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
Diego Biurrun [Thu, 26 May 2011 12:40:29 +0000 (14:40 +0200)]
doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.

8 years agoffplay: Remove disabled code.
Diego Biurrun [Tue, 26 Apr 2011 12:29:14 +0000 (14:29 +0200)]
ffplay: Remove disabled code.

8 years agoMark parameterless function declarations as 'void'.
Diego Biurrun [Thu, 26 May 2011 11:37:13 +0000 (13:37 +0200)]
Mark parameterless function declarations as 'void'.

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: remove VOF/VOFW.
Ronald S. Bultje [Thu, 26 May 2011 13:17:52 +0000 (09:17 -0400)]
swscale: remove VOF/VOFW.

8 years agoswscale: split chroma buffers into separate U/V planes.
Ronald S. Bultje [Wed, 25 May 2011 18:30:09 +0000 (14:30 -0400)]
swscale: split chroma buffers into separate U/V planes.

Preparatory step to implement support for sizes > VOFW.

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 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 agoffserver: Fix a null pointer dereference as a result of the FF_API_MAX_STREAMS cleanup.
Mike Williams [Wed, 18 May 2011 15:03:10 +0000 (11:03 -0400)]
ffserver: Fix a null pointer dereference as a result of the FF_API_MAX_STREAMS cleanup.

Fixed another dereference in the RTSP code.

Removed a useless variable.

Changed an unnecessary looping assignment to a simple assignment suggested by
Maksym.

Added fixes and tweaks suggested by Maksym Veremeyenko [verem@m1stereo.tv] and
Clément B.

8 years agolibdc1394: fix compilation.
Anton Khirnov [Thu, 26 May 2011 05:25:41 +0000 (07:25 +0200)]
libdc1394: fix compilation.

Add a forgotten comma and move options/class definition outside of
HAVE_LIBDC1394_1.

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 agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 26 May 2011 01:00:37 +0000 (03:00 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (32 commits)
  doc: create separate section for audio encoders
  swscale: Remove orphaned, commented-out function declaration.
  swscale: Eliminate rgb24toyv12_c() duplication.
  Remove h263_msmpeg4 from MpegEncContext.
  APIchanges: Fill in git hash for fps_probe_size (30315a8)
  avformat: Add fpsprobesize as an AVOption.
  avoptions: Return explicitly NAN or {0,0} if the option isn't found
  rtmp: Reindent
  rtmp: Don't try to do av_malloc(0)
  tty: replace AVFormatParameters.sample_rate abuse with a private option.
  Fix end time of last chapter in compute_chapters_end
  ffmpeg: get rid of useless AVInputStream.nb_streams.
  ffmpeg: simplify managing input files and streams
  ffmpeg: purge redundant AVInputStream.index.
  lavf: deprecate AVFormatParameters.channel.
  libdc1394: add a private option for channel.
  dv1394: add a private option for channel.
  v4l2: reindent.
  v4l2: add a private option for channel.
  lavf: deprecate AVFormatParameters.standard.
  ...

Conflicts:
doc/APIchanges
doc/encoders.texi
ffmpeg.c
libavdevice/alsa-audio.h
libavformat/version.h
libavutil/opt.c
libswscale/rgb2rgb.h
libswscale/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3enc: initialize all coefficients to zero.
Justin Ruggles [Thu, 26 May 2011 00:12:57 +0000 (20:12 -0400)]
ac3enc: initialize all coefficients to zero.

Uninitialized coefficients were being used to generate exponents, some
of which actually ended up in the final stream.  Even though, they were
just extra exponents that are not used by any decoder, it is still
better to have consistent output for testing. This also fixes valgrind
errors.

8 years agoffv1: fix 16bits multithreading
Michael Niedermayer [Wed, 25 May 2011 23:55:12 +0000 (01:55 +0200)]
ffv1: fix 16bits multithreading

fixes ticket237

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc: create separate section for audio encoders
Stefano Sabatini [Thu, 19 May 2011 17:41:19 +0000 (19:41 +0200)]
doc: create separate section for audio encoders

Having a separate section for audio encoders simplifies navigation
and is slightly more consistent with the rest of the manual.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoswscale: Remove orphaned, commented-out function declaration.
Diego Biurrun [Wed, 25 May 2011 20:07:55 +0000 (22:07 +0200)]
swscale: Remove orphaned, commented-out function declaration.

8 years agoswscale: Eliminate rgb24toyv12_c() duplication.
Michael Niedermayer [Wed, 25 May 2011 18:49:52 +0000 (20:49 +0200)]
swscale: Eliminate rgb24toyv12_c() duplication.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agompegvideo_enc: use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages
ami_stuff [Wed, 25 May 2011 21:38:16 +0000 (23:38 +0200)]
mpegvideo_enc: use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages

use AV_LOG_ERROR instead of AV_LOG_INFO for two error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFail when lowres value is lower than 0
ami_stuff [Wed, 25 May 2011 17:53:38 +0000 (19:53 +0200)]
Fail when lowres value is lower than 0

The attached patch fixes the crash which happens when user passes lowres value lower than 0 to FFplay.

ffplay -lowres -1 test.mpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove h263_msmpeg4 from MpegEncContext.
Alex Converse [Tue, 24 May 2011 23:28:45 +0000 (16:28 -0700)]
Remove h263_msmpeg4 from MpegEncContext.

It was long ago superseded by msmpeg4_version.

8 years agoAPIchanges: Fill in git hash for fps_probe_size (30315a8)
Alex Converse [Wed, 25 May 2011 19:36:41 +0000 (12:36 -0700)]
APIchanges: Fill in git hash for fps_probe_size (30315a8)

8 years agoavformat: Add fpsprobesize as an AVOption.
Alex Converse [Mon, 9 May 2011 21:34:23 +0000 (14:34 -0700)]
avformat: Add fpsprobesize as an AVOption.

8 years agoswscale: document SWS_CPU_CAPS*
Michael Niedermayer [Wed, 25 May 2011 19:04:44 +0000 (21:04 +0200)]
swscale: document SWS_CPU_CAPS*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert removial of SWS flags from e66149e714006d099d1ebfcca3f22ca74fc7dcf4
Michael Niedermayer [Wed, 25 May 2011 19:03:26 +0000 (21:03 +0200)]
Revert removial of SWS flags from e66149e714006d099d1ebfcca3f22ca74fc7dcf4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavoptions: Return explicitly NAN or {0,0} if the option isn't found
Martin Storsjö [Wed, 25 May 2011 13:47:09 +0000 (16:47 +0300)]
avoptions: Return explicitly NAN or {0,0} if the option isn't found

This actually matches what av_get_double did earlier, the
0.0/0.0 division was intentional, for producing NAN.

Still keeping the check for the return value from
av_get_number, for clarity.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortmp: Reindent
Martin Storsjö [Wed, 25 May 2011 19:01:15 +0000 (22:01 +0300)]
rtmp: Reindent

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortmp: Don't try to do av_malloc(0)
Martin Storsjö [Wed, 25 May 2011 16:08:29 +0000 (19:08 +0300)]
rtmp: Don't try to do av_malloc(0)

Some received packets can have size 0. The return value from
av_malloc(0) may be NULL, which is ok if the size was 0. On
OS X, however, the returned pointer is non-null but leads to
crashes when trying to free it.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoswscale: remove duplicatiopn of rgb24toyv12_c()
Michael Niedermayer [Wed, 25 May 2011 18:49:52 +0000 (20:49 +0200)]
swscale: remove duplicatiopn of rgb24toyv12_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoReturn -1 on invalid input instead of crashing.
Jean-Tiare Le Bigot [Wed, 25 May 2011 18:12:17 +0000 (20:12 +0200)]
Return -1 on invalid input instead of crashing.

8 years agovf_mp: fix name of the remove-logo filter referenced in filters.texi
Stefano Sabatini [Wed, 25 May 2011 16:29:55 +0000 (18:29 +0200)]
vf_mp: fix name of the remove-logo filter referenced in filters.texi

Correct the name from "remove_logo" to "remove-logo".

8 years agotty: replace AVFormatParameters.sample_rate abuse with a private option.
Anton Khirnov [Mon, 23 May 2011 17:23:55 +0000 (19:23 +0200)]
tty: replace AVFormatParameters.sample_rate abuse with a private option.

8 years agoFix end time of last chapter in compute_chapters_end
John Stebbins [Mon, 23 May 2011 21:26:54 +0000 (14:26 -0700)]
Fix end time of last chapter in compute_chapters_end

Parenthesis are misplaced in calculation of max_time.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoffmpeg: get rid of useless AVInputStream.nb_streams.
Anton Khirnov [Mon, 23 May 2011 15:19:54 +0000 (17:19 +0200)]
ffmpeg: get rid of useless AVInputStream.nb_streams.

It's a duplicate of AVFormatContext.nb_streams.

8 years agoffmpeg: simplify managing input files and streams
Anton Khirnov [Sun, 22 May 2011 20:12:35 +0000 (22:12 +0200)]
ffmpeg: simplify managing input files and streams

Grow the file and stream list in opt_input_file() instead of creating it
all at once in transcode().  This is simpler and will be useful for
following commits.

8 years agoffmpeg: purge redundant AVInputStream.index.
Anton Khirnov [Sun, 22 May 2011 19:54:06 +0000 (21:54 +0200)]
ffmpeg: purge redundant AVInputStream.index.

AVStream.index stores the same thing.

8 years agolavf: deprecate AVFormatParameters.channel.
Anton Khirnov [Mon, 23 May 2011 20:06:09 +0000 (22:06 +0200)]
lavf: deprecate AVFormatParameters.channel.

8 years agolibdc1394: add a private option for channel.
Anton Khirnov [Mon, 23 May 2011 20:01:36 +0000 (22:01 +0200)]
libdc1394: add a private option for channel.

8 years agodv1394: add a private option for channel.
Anton Khirnov [Mon, 23 May 2011 19:55:44 +0000 (21:55 +0200)]
dv1394: add a private option for channel.

8 years agov4l2: reindent.
Anton Khirnov [Tue, 24 May 2011 05:23:29 +0000 (07:23 +0200)]
v4l2: reindent.

8 years agov4l2: add a private option for channel.
Anton Khirnov [Mon, 23 May 2011 19:53:44 +0000 (21:53 +0200)]
v4l2: add a private option for channel.

8 years agolavf: deprecate AVFormatParameters.standard.
Anton Khirnov [Mon, 23 May 2011 19:40:44 +0000 (21:40 +0200)]
lavf: deprecate AVFormatParameters.standard.

8 years agov4l2: add a private option for video standard.
Anton Khirnov [Mon, 23 May 2011 19:21:59 +0000 (21:21 +0200)]
v4l2: add a private option for video standard.

8 years agov4l: add a private option for video standard.
Anton Khirnov [Mon, 23 May 2011 19:21:59 +0000 (21:21 +0200)]
v4l: add a private option for video standard.

8 years agodv1394: add a private option for video standard.
Anton Khirnov [Mon, 23 May 2011 18:58:07 +0000 (20:58 +0200)]
dv1394: add a private option for video standard.

8 years agobktr: add a private option for video standard.
Anton Khirnov [Mon, 23 May 2011 18:45:36 +0000 (20:45 +0200)]
bktr: add a private option for video standard.

8 years agolavf: deprecate AVFormatParameters.{channels,sample_rate}.
Anton Khirnov [Mon, 23 May 2011 18:13:28 +0000 (20:13 +0200)]
lavf: deprecate AVFormatParameters.{channels,sample_rate}.

8 years agorawdec: add sample_rate/channels private options.
Anton Khirnov [Mon, 23 May 2011 18:05:55 +0000 (20:05 +0200)]
rawdec: add sample_rate/channels private options.

8 years agoALSA: add channels and sample_rate private options.
Anton Khirnov [Mon, 23 May 2011 17:03:10 +0000 (19:03 +0200)]
ALSA: add channels and sample_rate private options.

8 years agooss: add channels and sample_rate private options.
Anton Khirnov [Mon, 23 May 2011 17:02:40 +0000 (19:02 +0200)]
oss: add channels and sample_rate private options.

8 years agosndio: add channels and sample_rate private options.
Anton Khirnov [Mon, 23 May 2011 17:02:08 +0000 (19:02 +0200)]
sndio: add channels and sample_rate private options.

8 years agolavf: deprecate AVFormatParameters.mpeg2ts_raw.
Anton Khirnov [Mon, 23 May 2011 19:06:14 +0000 (21:06 +0200)]
lavf: deprecate AVFormatParameters.mpeg2ts_raw.

It doesn't do anything except produce an error message when set.

8 years agompegts: add compute_pcr option.
Anton Khirnov [Sat, 30 Apr 2011 11:42:55 +0000 (13:42 +0200)]
mpegts: add compute_pcr option.

Deprecate the corresponding AVFormatParameters field.

8 years agolavf: add priv_class field to AVInputFormat.
Anton Khirnov [Tue, 24 May 2011 05:27:19 +0000 (07:27 +0200)]
lavf: add priv_class field to AVInputFormat.

8 years agolavfi: add select filter
Stefano Sabatini [Sat, 7 May 2011 00:06:25 +0000 (02:06 +0200)]
lavfi: add select filter

Address trac issue #92.

8 years agoeval: implement not() expression
Stefano Sabatini [Mon, 23 May 2011 11:13:50 +0000 (13:13 +0200)]
eval: implement not() expression

8 years agovsrc_buffer: return an error code if no frames are available
Stefano Sabatini [Thu, 19 May 2011 23:00:59 +0000 (01:00 +0200)]
vsrc_buffer: return an error code if no frames are available

Also decrease the log level of the corresponding message to WARNING,
since the error is not fatal.

8 years agoffmpeg: handle the case when get_filtered_frame() fails
Stefano Sabatini [Thu, 19 May 2011 22:59:47 +0000 (00:59 +0200)]
ffmpeg: handle the case when get_filtered_frame() fails

8 years agoindeo3: add out-of-buffer write check
Stefano Sabatini [Tue, 17 May 2011 20:21:33 +0000 (22:21 +0200)]
indeo3: add out-of-buffer write check

Prevent out-of-buffer writes. In particular fix smclocki32.avi.1.1
crash, trac issue #114, roundup issue #1482.

8 years agoAdd reading of disc number to mov.c
Reuben Thomas [Wed, 25 May 2011 09:15:56 +0000 (11:15 +0200)]
Add reading of disc number to mov.c

8 years agoFix end time of last chapter in compute_chapters_end().
John Stebbins [Wed, 25 May 2011 07:43:55 +0000 (09:43 +0200)]
Fix end time of last chapter in compute_chapters_end().

8 years agoDo not reset channel_layout to 0.
Carl Eugen Hoyos [Wed, 25 May 2011 07:43:14 +0000 (09:43 +0200)]
Do not reset channel_layout to 0.

The channel_layout may have been set by the demuxer.

8 years agovsrc_buffer: remove duplicated file description
Stefano Sabatini [Wed, 25 May 2011 07:37:25 +0000 (09:37 +0200)]
vsrc_buffer: remove duplicated file description

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 25 May 2011 04:32:23 +0000 (06:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  configure: enable memalign_hack automatically when needed
  swscale: unbreak the build on non-x86 systems.
  swscale: remove if(bitexact) branch from functions.
  swscale: remove if(canMMX2BeUsed) conditional.
  swscale: remove swScale_{c,MMX,MMX2} duplication.
  swscale: use emms_c().
  Move emms_c() from libavcodec to libavutil.
  tiff: set palette in the context when specified in TIFF_PAL tag
  rtsp: use strtoul to parse rtptime and seq values.
  pgssubdec: fix incorrect colors.
  dvdsubdec: fix incorrect colors.
  ape: Allow demuxing of files with metadata tags.
  swscale: remove dead macro WRITEBGR24OLD.
  swscale: remove AMD3DNOW "optimizations".
  swscale: remove duplicate code in ppc/ subdirectory.
  swscale: remove duplicated x86/ functions.
  swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*.
  vsrc_buffer.h: add file doxy
  vsrc_buffer: tweak error message in init()
  msmpeg4: reindent.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge swscale bloatup
Michael Niedermayer [Wed, 25 May 2011 03:23:39 +0000 (05:23 +0200)]
Merge swscale bloatup
This will be cleaned up in the next merge

Authorship / merged commits:
commit f668afd4896ee65683619b6f165dda4cdd46766f
Author: Janne Grunau <janne-libav@jannau.net>
Date:   Fri Apr 15 09:12:34 2011 +0200

    swscale: fix "ISO C90 forbids mixed declarations and code" warning

    only hit with --enable-runtime-cpudetect

commit 7f2ae5c7af374dfe254195a9375974a2ff9395a7
Author: Janne Grunau <janne-libav@jannau.net>
Date:   Fri Apr 15 02:09:44 2011 +0200

    swscale: fix compilation with --enable-runtime-cpudetect

commit b6cad3df822969b31bb93eaf677e52a72416bc97
Author: Janne Grunau <janne-libav@jannau.net>
Date:   Fri Apr 15 00:31:04 2011 +0200

    swscale: correct include path to fix ppc altivec build

commit 6216fc70b74e01a5272085329aa92f5ac797f9cf
Author: Luca Barbato <lu_zero@gentoo.org>
Date:   Thu Apr 14 22:03:45 2011 +0200

    swscale: simplify rgb2rgb templating

    MMX is always built. Drop the ifdefs

commit 33a0421bbaa64f4e9c3d852b7f225ede8dad1388
Author: Josh Allmann <joshua.allmann@gmail.com>
Date:   Wed Apr 13 20:57:32 2011 +0200

    swscale: simplify initialization code

    Simplify the fallthrough case when no accelerated functions
    can be initialized.

commit 735bf1951171a1e0ee4292e84a1b1beac45dd0ab
Author: Josh Allmann <joshua.allmann@gmail.com>
Date:   Wed Apr 13 20:57:31 2011 +0200

    swscale: further cleanup swscale.c

    Move x86-specific constants out of swscale.c

commit 86330b4c9258d5e583c0db033d1e68f46443307c
Author: Luca Barbato <lu_zero@gentoo.org>
Date:   Wed Apr 13 20:57:30 2011 +0200

    swscale: partially move the arch specific code left

    PPC and x86 code is split off from swscale_template.c. Lots of code is
    still duplicated and should be removed later.

    Again uniformize the init system to be more similar to the dsputil one.

    Unset h*scale_fast in the x86 init in order to make the output
    consistent with the previous status. Thanks to Josh for spotting it.

commit c0038328830d7b341c28d7c99b0236a33617fd21
Author: Luca Barbato <lu_zero@gentoo.org>
Date:   Wed Apr 13 20:57:29 2011 +0200

    swscale: move away x86 specific code from rgb2rgb

    Keep only the plain C code in the main rgb2rgb.c and move the x86
    specific optimizations to x86/rgb2rgb.c
    Change the initialization pattern a little so some of it can be
    factorized to behave more like dsputils.

Conflicts:
libswscale/rgb2rgb.c
libswscale/swscale_template.c

8 years agoswscale: MMX optim of hscale16()
Michael Niedermayer [Wed, 25 May 2011 00:40:22 +0000 (02:40 +0200)]
swscale: MMX optim of hscale16()

code is based on existing 8bit MMX code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: dont loose bits on planar >8bit yuv ind gray nput.
Michael Niedermayer [Tue, 24 May 2011 20:59:11 +0000 (22:59 +0200)]
swscale: dont loose bits on planar >8bit yuv ind gray nput.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>