ffmpeg.git
8 years agoMerge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'
Michael Niedermayer [Sat, 13 Aug 2011 00:16:44 +0000 (02:16 +0200)]
Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

* commit 'b2c087871dafc7d030b2d48457ddff597dfd4925':
  Move x86util.asm from libavcodec/ to libavutil/.
  Move x86inc.asm to libavutil/.
  APIchanges: note error_recognition in lavf
  lavf: add support for error_recognition, use it in avidec, and bump minor API version
  avconv: change semantics of -map
  avconv: get rid of new* options.
  cmdutils: allow precisely specifying a stream for AVOptions.
  configure: add missing CFLAGS to fix building on the HURD
  libx264: Include hint for possible values for configuring libx264
  cmdutils: allow ':'-separated modifiers in option names.
  avconv: make -map_metadata work consistently with the other options
  avconv: remove deprecated options.
  avconv: make -map_chapters accept only the input file index.
  Make a copy of ffmpeg under a new name -- avconv.
  ffmpeg: add a warning stating that the program is deprecated.
  Add weighted motion compensation for RV40 B-frames
  RV3/4: calculate B-frame motion weights once per frame
  Move RV3/4-specific DSP functions into their own context
  mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
  h264: notice memory allocation failure

Conflicts:
.gitignore
Makefile
cmdutils.c
configure
doc/ffplay.texi
doc/ffprobe.texi
doc/ffserver.texi
libavcodec/libx264.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/version.h
tests/lavf-regression.sh
tests/lavfi-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3dec: export center & suroundmix levels
Michael Niedermayer [Fri, 12 Aug 2011 22:55:11 +0000 (00:55 +0200)]
ac3dec: export center & suroundmix levels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_get_string: search children too.
Michael Niedermayer [Fri, 12 Aug 2011 22:54:07 +0000 (00:54 +0200)]
av_get_string: search children too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_get_number: also search children, this is more sane than not doing so.
Michael Niedermayer [Fri, 12 Aug 2011 22:49:04 +0000 (00:49 +0200)]
av_get_number: also search children, this is more sane than not doing so.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoopt_find: fix segfault
Michael Niedermayer [Fri, 12 Aug 2011 23:04:53 +0000 (01:04 +0200)]
opt_find: fix segfault

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMove x86util.asm from libavcodec/ to libavutil/.
Ronald S. Bultje [Wed, 3 Aug 2011 16:48:08 +0000 (09:48 -0700)]
Move x86util.asm from libavcodec/ to libavutil/.

This allows using it in swscale also.

8 years agoMove x86inc.asm to libavutil/.
Ronald S. Bultje [Sun, 24 Jul 2011 01:36:35 +0000 (18:36 -0700)]
Move x86inc.asm to libavutil/.

This allows using it in libswscale/ also.

8 years agoAPIchanges: note error_recognition in lavf
Dustin Brody [Sat, 6 Aug 2011 05:42:35 +0000 (01:42 -0400)]
APIchanges: note error_recognition in lavf

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavf: add support for error_recognition, use it in avidec, and bump minor API version
Dustin Brody [Sat, 6 Aug 2011 04:42:34 +0000 (04:42 +0000)]
lavf: add support for error_recognition, use it in avidec, and bump minor API version

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavconv: change semantics of -map
Anton Khirnov [Fri, 29 Jul 2011 13:21:51 +0000 (15:21 +0200)]
avconv: change semantics of -map

New syntax contains an optional stream type, allowing to refer to n-th
stream of specific type.

Omitting stream number now maps all streams of the given type.

8 years agoavconv: get rid of new* options.
Anton Khirnov [Fri, 29 Jul 2011 06:36:13 +0000 (08:36 +0200)]
avconv: get rid of new* options.

They are confusing, irregular and redundant -- -map already contains all
the information.  Stream maps can now be parsed in opt_output_file().

Add a more user-friendly default behavior in case no maps are present.

Breaks -programid for now, but it never worked properly anyway. A better
solution will be written soon.

8 years agocmdutils: allow precisely specifying a stream for AVOptions.
Anton Khirnov [Thu, 28 Jul 2011 14:47:38 +0000 (16:47 +0200)]
cmdutils: allow precisely specifying a stream for AVOptions.

8 years agoac3enc: drop common fixed/float encoder
Michael Niedermayer [Fri, 12 Aug 2011 14:15:54 +0000 (16:15 +0200)]
ac3enc: drop common fixed/float encoder
User applications should by now be able to support float encoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: add missing CFLAGS to fix building on the HURD
Pino Toscano [Fri, 12 Aug 2011 12:11:21 +0000 (14:11 +0200)]
configure: add missing CFLAGS to fix building on the HURD

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agolibx264: Include hint for possible values for configuring libx264
Reinhard Tartler [Tue, 9 Aug 2011 12:44:12 +0000 (14:44 +0200)]
libx264: Include hint for possible values for configuring libx264

The output of the x264 commandline tool contains the most uptodate
description of the possible values for the -preset, -tune and -profile
options.

8 years agocmdutils: allow ':'-separated modifiers in option names.
Anton Khirnov [Fri, 29 Jul 2011 11:47:37 +0000 (13:47 +0200)]
cmdutils: allow ':'-separated modifiers in option names.

8 years agoavconv: make -map_metadata work consistently with the other options
Anton Khirnov [Fri, 29 Jul 2011 11:07:27 +0000 (13:07 +0200)]
avconv: make -map_metadata work consistently with the other options

Before, it took an input and output file index, now it only takes an
input file and applies to the next output file.

Stream/chapter/program specification is now part of the option name and
the delimiter was changed from ',' to ':' to be consistent with the
similar feature for AVOptions.

8 years agoavconv: remove deprecated options.
Anton Khirnov [Thu, 28 Jul 2011 10:57:24 +0000 (12:57 +0200)]
avconv: remove deprecated options.

8 years agoavconv: make -map_chapters accept only the input file index.
Anton Khirnov [Wed, 27 Jul 2011 19:39:12 +0000 (21:39 +0200)]
avconv: make -map_chapters accept only the input file index.

This is consistent with how all the other options work.

8 years agoMake a copy of ffmpeg under a new name -- avconv.
Anton Khirnov [Wed, 27 Jul 2011 18:56:59 +0000 (20:56 +0200)]
Make a copy of ffmpeg under a new name -- avconv.

It will be further developed with a few incompatible changes.

ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.

8 years agoffmpeg: add a warning stating that the program is deprecated.
Anton Khirnov [Wed, 27 Jul 2011 19:04:26 +0000 (21:04 +0200)]
ffmpeg: add a warning stating that the program is deprecated.

8 years agoAdd weighted motion compensation for RV40 B-frames
Kostya Shishkov [Wed, 10 Aug 2011 09:26:39 +0000 (11:26 +0200)]
Add weighted motion compensation for RV40 B-frames

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoRV3/4: calculate B-frame motion weights once per frame
Kostya Shishkov [Wed, 10 Aug 2011 09:26:24 +0000 (11:26 +0200)]
RV3/4: calculate B-frame motion weights once per frame

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMove RV3/4-specific DSP functions into their own context
Kostya Shishkov [Tue, 9 Aug 2011 09:00:09 +0000 (11:00 +0200)]
Move RV3/4-specific DSP functions into their own context

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agomjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt
Dustin Brody [Thu, 11 Aug 2011 15:16:09 +0000 (11:16 -0400)]
mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoh264: notice memory allocation failure
Dustin Brody [Thu, 11 Aug 2011 12:57:58 +0000 (08:57 -0400)]
h264: notice memory allocation failure

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 11 Aug 2011 18:17:53 +0000 (20:17 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3enc: add macros for option names to make them more understandable.
  ac3enc: fix 'channel_coupling' option to actually allow 'auto'.
  cavs: fix some crashes with invalid bitstreams
  ac3enc: clip coupling coordinates during calculation
  Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.
  lavc: fix parentheses placement in avcodec_open2().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocavsdec: check run value validity
Michael Niedermayer [Thu, 11 Aug 2011 17:55:44 +0000 (19:55 +0200)]
cavsdec: check run value validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3enc: add macros for option names to make them more understandable.
Justin Ruggles [Tue, 9 Aug 2011 22:11:08 +0000 (18:11 -0400)]
ac3enc: add macros for option names to make them more understandable.

8 years agoac3enc: fix 'channel_coupling' option to actually allow 'auto'.
Justin Ruggles [Wed, 10 Aug 2011 14:21:10 +0000 (10:21 -0400)]
ac3enc: fix 'channel_coupling' option to actually allow 'auto'.

Use 'auto' as the default value.

8 years agoindevs.texi: fix typo (builf -> build)
Stefano Sabatini [Thu, 11 Aug 2011 15:32:54 +0000 (17:32 +0200)]
indevs.texi: fix typo (builf -> build)

8 years agolavdev: add libavfilter virtual input device
Stefano Sabatini [Sat, 11 Jun 2011 13:40:08 +0000 (15:40 +0200)]
lavdev: add libavfilter virtual input device

This input device is to be considered still experimental, only video
output is supported.

8 years agolavfi: remove mp test wrapper
Stefano Sabatini [Wed, 10 Aug 2011 00:10:44 +0000 (02:10 +0200)]
lavfi: remove mp test wrapper

The source was natively integrated into libavfilter, with the name
mptestsrc.

8 years agolavfi: port mp test source
Stefano Sabatini [Mon, 8 Aug 2011 12:41:22 +0000 (14:41 +0200)]
lavfi: port mp test source

8 years agovf_mp: sort listing of vf_info_t symbols
Stefano Sabatini [Sat, 6 Aug 2011 09:38:41 +0000 (11:38 +0200)]
vf_mp: sort listing of vf_info_t symbols

This way it's easier for the programmer to look-up for a specific
symbols (e.g. for checking if it's unused).

8 years agovf_select: reindent after the previous commit
Stefano Sabatini [Thu, 11 Aug 2011 13:49:11 +0000 (15:49 +0200)]
vf_select: reindent after the previous commit

8 years agovf_select: add NULL-checks in uninit
William Yu [Thu, 11 Aug 2011 13:47:33 +0000 (15:47 +0200)]
vf_select: add NULL-checks in uninit

Fix NULL pointer dereference in case of failed initialization.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agovf_select: check for isnan when setting t from pts
Stefano Sabatini [Thu, 11 Aug 2011 13:42:05 +0000 (15:42 +0200)]
vf_select: check for isnan when setting t from pts

8 years agovf_select: set start_t if undefined
William Yu [Thu, 11 Aug 2011 13:40:03 +0000 (15:40 +0200)]
vf_select: set start_t if undefined

Previously start_t was never set.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agocavs: fix some crashes with invalid bitstreams
Mans Rullgard [Wed, 10 Aug 2011 17:52:11 +0000 (18:52 +0100)]
cavs: fix some crashes with invalid bitstreams

This removes all valgrind-reported invalid writes with one
specific test file.

Fixes http://www.ocert.org/advisories/ocert-2011-002.html

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoac3enc: clip coupling coordinates during calculation
Justin Ruggles [Sun, 7 Aug 2011 21:12:49 +0000 (17:12 -0400)]
ac3enc: clip coupling coordinates during calculation

This is faster than using the clip_coefficients() function. Also,
clipping the coordinates before determining reuse is better since it
will compare coordinates that are closer to their final encoded values.

8 years agoRemove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.
Justin Ruggles [Wed, 10 Aug 2011 18:07:35 +0000 (14:07 -0400)]
Remove incorrect info in documentation of AVCodecContext.bits_per_raw_sample.

bits_per_raw_sample is used in video as well, where sample_fmt is not used.

8 years agooggenc: add missing initializer braces to shut up gcc warning.
Clément Bœsch [Wed, 10 Aug 2011 19:03:39 +0000 (21:03 +0200)]
oggenc: add missing initializer braces to shut up gcc warning.

This fixes the warning:
    libavformat/oggenc.c:75:7: warning: missing braces around initializer [-Wmissing-braces]

8 years agoavidec: add missing initializer braces to shut up gcc warning.
Clément Bœsch [Wed, 10 Aug 2011 19:02:32 +0000 (21:02 +0200)]
avidec: add missing initializer braces to shut up gcc warning.

This fixes the warning:
    libavformat/avidec.c:81:5: warning: missing braces around initializer [-Wmissing-braces]

8 years agoalsa: remove too unused variables.
Clément Bœsch [Wed, 10 Aug 2011 18:52:41 +0000 (20:52 +0200)]
alsa: remove too unused variables.

This fixes the two following warnings:
    libavdevice/alsa-audio-dec.c:62:26: warning: unused variable ‘sw_params’ [-Wunused-variable]
    libavdevice/alsa-audio-dec.c:109:15: warning: unused variable ‘st’ [-Wunused-variable]

8 years agoAlways pass a AVFormatContext to av_log.
Reimar Döffinger [Tue, 9 Aug 2011 17:14:12 +0000 (19:14 +0200)]
Always pass a AVFormatContext to av_log.

This is consistent, allows custom handlers to print more info
(since they probably know about the AVFormatContext class
but not a demuxer-specific one) and also avoids issues due
to the class pointer being NULL for non-raw mpegts.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agocavsdec: avoid possible crash with crafted input
Michael Niedermayer [Wed, 10 Aug 2011 15:29:51 +0000 (17:29 +0200)]
cavsdec: avoid possible crash with crafted input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: fix parentheses placement in avcodec_open2().
Baptiste Coudurier [Tue, 9 Aug 2011 06:41:50 +0000 (23:41 -0700)]
lavc: fix parentheses placement in avcodec_open2().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 10 Aug 2011 14:29:46 +0000 (16:29 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: make avcodec_init() static on next bump.
  ac3enc: remove unneeded #include
  ac3enc: restructure coupling coordinate reuse calculation
  ac3enc: allow new coupling coordinates to be sent independently for each channel.
  ac3enc: separate exponent bit counting from exponent grouping.
  h264: propagate error return values for AV_LOG_ERROR-triggering events
  aac: Don't attempt to output configure an invalid channel configuration.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoNoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'
Michael Niedermayer [Wed, 10 Aug 2011 14:28:12 +0000 (16:28 +0200)]
NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'

* commit '4d58e4cb4ca8e04317fecea432ea3272a445877c':
  Rename ffserver to avserver.
  Rename ffprobe to avprobe.
  Rename ffplay to avplay.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotimecode: move dropframe code and doxycomment it.
Clément Bœsch [Wed, 6 Jul 2011 12:55:06 +0000 (14:55 +0200)]
timecode: move dropframe code and doxycomment it.

This is based on the original work by Baptiste Coudurier.

8 years agotimecode: introduce timecode and honor it in MPEG-1/2.
Clément Bœsch [Wed, 6 Jul 2011 12:44:59 +0000 (14:44 +0200)]
timecode: introduce timecode and honor it in MPEG-1/2.

This is based on the original work by Baptiste Coudurier.

8 years agooptions: handle options with the same name in codecs and formats.
Clément Bœsch [Tue, 26 Jul 2011 07:03:20 +0000 (09:03 +0200)]
options: handle options with the same name in codecs and formats.

This will allow the incoming -timecode option to be handled in both
encoders (mpeg12enc in that case) and demuxers (dv, mxf, etc.).

8 years agocavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check
Michael Niedermayer [Wed, 10 Aug 2011 11:28:36 +0000 (13:28 +0200)]
cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: make avcodec_init() static on next bump.
Anton Khirnov [Wed, 10 Aug 2011 07:50:00 +0000 (09:50 +0200)]
lavc: make avcodec_init() static on next bump.

It's called from avcodec_register() anyway, so there's no reason for it
to be public.

8 years agoac3enc: remove unneeded #include
Justin Ruggles [Sun, 7 Aug 2011 21:09:47 +0000 (17:09 -0400)]
ac3enc: remove unneeded #include

8 years agoac3enc: restructure coupling coordinate reuse calculation
Justin Ruggles [Fri, 5 Aug 2011 21:34:53 +0000 (17:34 -0400)]
ac3enc: restructure coupling coordinate reuse calculation

8 years agoac3enc: allow new coupling coordinates to be sent independently for each
Justin Ruggles [Fri, 5 Aug 2011 20:28:39 +0000 (16:28 -0400)]
ac3enc: allow new coupling coordinates to be sent independently for each
channel.

8 years agoac3enc: separate exponent bit counting from exponent grouping.
Justin Ruggles [Fri, 5 Aug 2011 20:00:18 +0000 (16:00 -0400)]
ac3enc: separate exponent bit counting from exponent grouping.

Move bit counting to the bit allocation function. Move exponent grouping to
after bit allocation. This will allow for adjustment of bandwidth parameters
during bit allocation without having to do exponent grouping multiple times.

8 years agolavc: bump minor for Go2Meeting codec ID
Michael Niedermayer [Tue, 9 Aug 2011 20:11:08 +0000 (22:11 +0200)]
lavc: bump minor for Go2Meeting codec ID

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAVCodecTag: Add MKTAG for Go2Meeting video codec
Thierry Foucu [Tue, 9 Aug 2011 18:32:25 +0000 (11:32 -0700)]
AVCodecTag: Add MKTAG for Go2Meeting video codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAVCodec: Add Go2Meeting codec ID
Thierry Foucu [Tue, 9 Aug 2011 18:32:24 +0000 (11:32 -0700)]
AVCodec: Add Go2Meeting codec ID

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: pass frame durations clearly to video video_refresh
Marton Balint [Wed, 3 Aug 2011 22:59:45 +0000 (00:59 +0200)]
ffplay: pass frame durations clearly to video video_refresh

Previously the target clock of the next frame was calculated by using video_clock
which is modified from another thread...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: propagate error return values for AV_LOG_ERROR-triggering events
Dustin Brody [Thu, 4 Aug 2011 21:47:16 +0000 (17:47 -0400)]
h264: propagate error return values for AV_LOG_ERROR-triggering events

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoaac: Don't attempt to output configure an invalid channel configuration.
Alex Converse [Fri, 5 Aug 2011 19:40:51 +0000 (12:40 -0700)]
aac: Don't attempt to output configure an invalid channel configuration.

8 years agoRename ffserver to avserver.
Anton Khirnov [Tue, 26 Jul 2011 19:56:56 +0000 (21:56 +0200)]
Rename ffserver to avserver.

8 years agoRename ffprobe to avprobe.
Anton Khirnov [Tue, 26 Jul 2011 17:04:43 +0000 (19:04 +0200)]
Rename ffprobe to avprobe.

8 years agoRename ffplay to avplay.
Anton Khirnov [Tue, 26 Jul 2011 15:51:34 +0000 (17:51 +0200)]
Rename ffplay to avplay.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 9 Aug 2011 14:32:39 +0000 (16:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Pretty-print RV3/4 decoder source
  Saner RV1/2 initialisation and RV2 header parsing.

Conflicts:
libavcodec/rv10.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agora288: avoid one multiply
Michael Niedermayer [Tue, 9 Aug 2011 13:08:20 +0000 (15:08 +0200)]
ra288: avoid one multiply

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoPretty-print RV3/4 decoder source
Kostya Shishkov [Tue, 9 Aug 2011 09:19:55 +0000 (11:19 +0200)]
Pretty-print RV3/4 decoder source

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years ago100l: fix parentheses placement when checking for ret < 0
Baptiste Coudurier [Tue, 9 Aug 2011 06:41:50 +0000 (23:41 -0700)]
100l: fix parentheses placement when checking for ret < 0

8 years agoSaner RV1/2 initialisation and RV2 header parsing.
Kostya Shishkov [Thu, 4 Aug 2011 19:00:12 +0000 (21:00 +0200)]
Saner RV1/2 initialisation and RV2 header parsing.

Old version was based on lots of guesswork which had different hacks based on
32-bit version field instead of splitting it into major/minor/micro version.
RV2 picture header parser also had a few places where it deviated from binary
decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoffmpeg: fix passlogfile regression
Carl Eugen Hoyos [Mon, 8 Aug 2011 23:05:28 +0000 (01:05 +0200)]
ffmpeg: fix passlogfile regression

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 8 Aug 2011 21:35:22 +0000 (23:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: do not set pic quality if no frame is output
  libx264: add preset, tune, profile and fastfirstpass private options

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibx264: do not set pic quality if no frame is output
Baptiste Coudurier [Sun, 30 Jan 2011 01:05:42 +0000 (17:05 -0800)]
libx264: do not set pic quality if no frame is output

Avoids uninitialized reads.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolibx264: add preset, tune, profile and fastfirstpass private options
Baptiste Coudurier [Sat, 16 Apr 2011 23:50:50 +0000 (16:50 -0700)]
libx264: add preset, tune, profile and fastfirstpass private options

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavfi: remove gradfun mp wrapper
Stefano Sabatini [Thu, 4 Aug 2011 22:16:04 +0000 (00:16 +0200)]
lavfi: remove gradfun mp wrapper

The gradfun filter was already integrated natively in libavfilter.
Both filters issue the same output, and have a comparable performance.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: remove gradfun mp wrapper
Date: Fri,  5 Aug 2011 00:19:04 +0200

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 6 Aug 2011 22:32:11 +0000 (00:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: fix misspelling in comment
  aac: propagate error return values for AV_LOG_ERROR-triggering events

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: fix registration name for the buffersink sink
Stefano Sabatini [Sat, 6 Aug 2011 10:45:29 +0000 (12:45 +0200)]
lavfi: fix registration name for the buffersink sink

Previously both the buffer and buffersink elements were associated to
the "BUFFER" symbol in allfilters.c, so it was not possible to enable
one without the other.

8 years agolavfi: avoid void* arithmetic in defaults.c:set_common_formats()
Stefano Sabatini [Sat, 6 Aug 2011 10:42:02 +0000 (12:42 +0200)]
lavfi: avoid void* arithmetic in defaults.c:set_common_formats()

void* pointer arithmetic semantics is undefined, use uint8_t* instead.

Also fix GCC warnings:
defaults.c: In function ‘set_common_formats’:
defaults.c:184: warning: pointer of type ‘void *’ used in arithmetic
defaults.c:189: warning: pointer of type ‘void *’ used in arithmetic

8 years agolavfi: add asink_abuffer - audio buffer sink
Mina Nagy Zaki [Sat, 6 Aug 2011 10:30:33 +0000 (12:30 +0200)]
lavfi: add asink_abuffer - audio buffer sink

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agolavfi: fix doxygen doc for config_props() callback
Mina Nagy Zaki [Thu, 4 Aug 2011 12:47:01 +0000 (15:47 +0300)]
lavfi: fix doxygen doc for config_props() callback

Update/extend documentation related to the link fields to set, and fix
a pads->filters braino.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agolavfi: remove default config_props() callback and refactor avfilter_config_links()
Mina Nagy Zaki [Thu, 4 Aug 2011 12:47:00 +0000 (15:47 +0300)]
lavfi: remove default config_props() callback and refactor avfilter_config_links()

Link properties have to be checked after config_props() is called to
make sure everything is sane, so the default config_props() for output
links was redundant.

Also remove channel_layout check as it is now negotiated.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agolavfi: remove avfilter_default_config_input_link() declaration
Stefano Sabatini [Sat, 6 Aug 2011 10:11:12 +0000 (12:11 +0200)]
lavfi: remove avfilter_default_config_input_link() declaration

The function is not implemented (and possibly useless).

8 years agolavc: fix misspelling in comment
Dustin Brody [Sat, 6 Aug 2011 00:38:46 +0000 (20:38 -0400)]
lavc: fix misspelling in comment

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 5 Aug 2011 19:47:21 +0000 (21:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lsws: remove optimization debug logs in sws_init_context()
  lsws: use array for storing the supported in/out information

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaac: propagate error return values for AV_LOG_ERROR-triggering events
Dustin Brody [Fri, 5 Aug 2011 02:32:09 +0000 (22:32 -0400)]
aac: propagate error return values for AV_LOG_ERROR-triggering events

8 years agoffmpeg: Fix doxygen comments for MetadataMap
Michael Niedermayer [Thu, 4 Aug 2011 23:18:07 +0000 (01:18 +0200)]
ffmpeg: Fix doxygen comments for MetadataMap

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolsws: remove optimization debug logs in sws_init_context()
Stefano Sabatini [Thu, 4 Aug 2011 15:53:44 +0000 (17:53 +0200)]
lsws: remove optimization debug logs in sws_init_context()

The logged information is possibly false, and it tends to be outdated
after each change since the logging code needs to be manually updated.

Simplify and prevent confusing wrong debug messages.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agolsws: use array for storing the supported in/out information
Stefano Sabatini [Wed, 3 Aug 2011 23:34:49 +0000 (01:34 +0200)]
lsws: use array for storing the supported in/out information

Also remove the unnecessary isSupportedIn/Out macros.

Make the code more compact/readable, and simplify the access to
lsws-specific pixel format information.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agofilters.texi: fix wrong references in the "Filtergraph syntax" section
Stefano Sabatini [Thu, 4 Aug 2011 21:49:14 +0000 (23:49 +0200)]
filters.texi: fix wrong references in the "Filtergraph syntax" section

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 4 Aug 2011 18:59:29 +0000 (20:59 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  applehttp: fix variant discard logic
  h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoyadif: correct documentation on the parity parameter
Stefano Sabatini [Wed, 3 Aug 2011 22:25:35 +0000 (00:25 +0200)]
yadif: correct documentation on the parity parameter

0 is top-field-first, 1 is bottom-field-first, not the other way
around.

Fix trac issue #380.

8 years agompegvideo.h: remove the 1 line difference to qatar
Michael Niedermayer [Thu, 4 Aug 2011 15:04:14 +0000 (17:04 +0200)]
mpegvideo.h: remove the 1 line difference to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoapplehttp: fix variant discard logic
Luca Barbato [Wed, 3 Aug 2011 23:06:58 +0000 (01:06 +0200)]
applehttp: fix variant discard logic

The v->ctx is always not NULL now, check for streams presence to
mark the read_header state.

Fixes bug #25, possibly introduced by 603b8bc

8 years agoFix possible crash when decoding mpeg streams.
Carl Eugen Hoyos [Thu, 4 Aug 2011 09:06:43 +0000 (11:06 +0200)]
Fix possible crash when decoding mpeg streams.

This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7,
fixes ticket 329.

8 years agoh263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.
Alex Converse [Thu, 4 Aug 2011 00:31:11 +0000 (17:31 -0700)]
h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 3 Aug 2011 23:40:29 +0000 (01:40 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: remove some stray comments from AVCodec declarations
  cosmetics: fix indentation/alignment in AVCodec declarations
  arm: Avoid using the movw instruction needlessly
  Move an int64_t down in MpegEncContext

Conflicts:
libavcodec/arm/ac3dsp_armv6.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: skip seek pos adjustment for non interleaved files.
Michael Niedermayer [Wed, 3 Aug 2011 23:04:50 +0000 (01:04 +0200)]
avidec: skip seek pos adjustment for non interleaved files.
Fixes Ticket327

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