ffmpeg.git
7 years agomxf: H.264/MPEG-4 AVC Intra support
Baptiste Coudurier [Sun, 14 Aug 2011 22:40:54 +0000 (00:40 +0200)]
mxf: H.264/MPEG-4 AVC Intra support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264dec: h264: 4:2:2 intra decoding
Baptiste Coudurier [Sun, 14 Aug 2011 22:39:55 +0000 (00:39 +0200)]
h264dec: h264: 4:2:2 intra decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodsputil_mmx: fix indention
Baptiste Coudurier [Sun, 14 Aug 2011 22:37:19 +0000 (00:37 +0200)]
dsputil_mmx: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: Fix vshift vs hshift typo
Baptiste Coudurier [Sun, 14 Aug 2011 22:34:41 +0000 (00:34 +0200)]
mpegvideo: Fix vshift vs hshift typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 14 Aug 2011 17:49:04 +0000 (19:49 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacenc: Fix number of coefficients used in a LFE channel.
  aacenc: Fix a segfault with grouped psymodel.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: remove hScale16NX_c()
Michael Niedermayer [Sun, 14 Aug 2011 17:19:45 +0000 (19:19 +0200)]
sws: remove hScale16NX_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: remove hScale16N() and use ronalds reformated version of it.
Michael Niedermayer [Sun, 14 Aug 2011 17:05:03 +0000 (19:05 +0200)]
sws: remove hScale16N() and use ronalds reformated version of it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: remove unneeded code from last merge
Michael Niedermayer [Sun, 14 Aug 2011 13:22:50 +0000 (15:22 +0200)]
sws: remove unneeded code from last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_unsharp: set default chroma size value to 5x5
Stefano Sabatini [Sat, 13 Aug 2011 14:30:44 +0000 (16:30 +0200)]
vf_unsharp: set default chroma size value to 5x5

The previous default value 0x0 was not good, since it is not even
valid.

7 years agovf_unsharp: fix out-of-buffer read
Stefano Sabatini [Fri, 12 Aug 2011 06:42:35 +0000 (08:42 +0200)]
vf_unsharp: fix out-of-buffer read

In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.

The check was implemented in the original unsharp libmpcodecs code and
lost in the port.

This also fixes output discrepancy between the two filters.

7 years agolavfi: remove delogo mp wrapper
Stefano Sabatini [Sun, 14 Aug 2011 10:04:23 +0000 (12:04 +0200)]
lavfi: remove delogo mp wrapper

The delogo filter has been natively integrated into libavfilter,
simplify.

7 years agolavfi: port libmpcodecs delogo filter
Stefano Sabatini [Wed, 10 Aug 2011 16:58:49 +0000 (18:58 +0200)]
lavfi: port libmpcodecs delogo filter

The ported filter supports named option parsing and more YUV formats.

7 years agolavfi: add aformat filter
Mina Nagy Zaki [Thu, 14 Jul 2011 11:18:13 +0000 (14:18 +0300)]
lavfi: add aformat filter

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
7 years agolavfi: add internal functions for parsing format arguments
Mina Nagy Zaki [Thu, 4 Aug 2011 09:28:14 +0000 (12:28 +0300)]
lavfi: add internal functions for parsing format arguments

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
7 years agoaacenc: Fix number of coefficients used in a LFE channel.
Nathan Caldwell [Fri, 29 Jul 2011 20:49:04 +0000 (14:49 -0600)]
aacenc: Fix number of coefficients used in a LFE channel.

The spec states:

 *  Only the lowest 12 spectral coefficients of any LFE may be non-zero

We were using the 12 lowest *bands*.

7 years agoaacenc: Fix a segfault with grouped psymodel.
Nathan Caldwell [Sat, 23 Jul 2011 07:19:34 +0000 (01:19 -0600)]
aacenc: Fix a segfault with grouped psymodel.

10l: Forgot about TYPE_LFE being after TYPE_CPE. Which causes a
segfault when encoding 5.1

7 years agovsink_buffer: make the buffer cache all the incoming frames
Stefano Sabatini [Wed, 29 Jun 2011 15:31:16 +0000 (17:31 +0200)]
vsink_buffer: make the buffer cache all the incoming frames

Allow to cache more than one frame (e.g. for filters which return
more than one frame when avfilter_request_frame() is called on them),
and do not discard previously cached frames when a new one is added.

7 years agofifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()
Stefano Sabatini [Sat, 13 Aug 2011 17:11:05 +0000 (19:11 +0200)]
fifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()

7 years agofifo: apply misc cosmetic fixes
Stefano Sabatini [Sat, 13 Aug 2011 17:10:05 +0000 (19:10 +0200)]
fifo: apply misc cosmetic fixes

7 years agofifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
Stefano Sabatini [Sat, 13 Aug 2011 16:26:01 +0000 (18:26 +0200)]
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()

The new function provides a more flexible interface for peeking at a
FIFO buffer data.

7 years agolavdev/lavfi: correctly set the inout pad index when linking a filter to the output...
Stefano Sabatini [Sat, 13 Aug 2011 23:17:02 +0000 (01:17 +0200)]
lavdev/lavfi: correctly set the inout pad index when linking a filter to the output sink

In lavfi_read_header(), use the pad index designated in the inout for
linking an output to a sink, rather than always 0. Fix link creation
for filters with more than one output (e.g. the split filter).

7 years agoVC-1: fix reading of custom PAR.
Reimar Döffinger [Sat, 13 Aug 2011 09:58:18 +0000 (11:58 +0200)]
VC-1: fix reading of custom PAR.

Custom PAR num/denum are coded -1.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoSupport streaming .au files.
Reimar Döffinger [Sat, 13 Aug 2011 10:06:09 +0000 (12:06 +0200)]
Support streaming .au files.

FFmpeg writes data_size as AU_UNKNOWN_SIZE, make demuxer not
fail when data_size is set to this value.
Should fix trac issue #394.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 13 Aug 2011 20:23:40 +0000 (22:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: add dithering to yuv2yuvX_altivec_real
  rv34: free+allocate buffer instead of reallocating it to preserve alignment
  h264: add missing brackets.
  swscale: use 15-bit intermediates for 9/10-bit scaling.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodv: honor timecode in DV muxer.
Clément Bœsch [Wed, 6 Jul 2011 13:08:28 +0000 (15:08 +0200)]
dv: honor timecode in DV muxer.

This is based on the original work by Baptiste Coudurier.

7 years agomxf: honor timecode drop flag in mxf muxer if set.
Clément Bœsch [Tue, 26 Jul 2011 09:31:00 +0000 (11:31 +0200)]
mxf: honor timecode drop flag in mxf muxer if set.

7 years agomxf: add cli option in mxfenc to replace GOP timecode parsing.
Clément Bœsch [Wed, 6 Jul 2011 14:35:12 +0000 (16:35 +0200)]
mxf: add cli option in mxfenc to replace GOP timecode parsing.

This is based on the original work by Baptiste Coudurier.

7 years agomxf: move framenum to timecode convert to timecode helpers.
Clément Bœsch [Wed, 6 Jul 2011 13:04:26 +0000 (15:04 +0200)]
mxf: move framenum to timecode convert to timecode helpers.

This is based on the original work by Baptiste Coudurier.

7 years agovf_unsharp: fix copy&paste error in chroma_amount param docs
Robert Krüger [Sat, 13 Aug 2011 14:41:07 +0000 (16:41 +0200)]
vf_unsharp: fix copy&paste error in chroma_amount param docs

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
7 years agovf_unsharp: vertically align lines, for better readability
Stefano Sabatini [Fri, 12 Aug 2011 22:41:17 +0000 (00:41 +0200)]
vf_unsharp: vertically align lines, for better readability

7 years agovf_unsharp: store hsub/vsub in the filter context
Stefano Sabatini [Fri, 12 Aug 2011 07:30:17 +0000 (09:30 +0200)]
vf_unsharp: store hsub/vsub in the filter context

Also drop obfuscating CHROMA_WIDTH/HEIGHT macros.

7 years agovf_unsharp: adopt a more natural order of params in apply_unsharp()
Stefano Sabatini [Fri, 12 Aug 2011 07:22:31 +0000 (09:22 +0200)]
vf_unsharp: adopt a more natural order of params in apply_unsharp()

7 years agovf_unsharp: rename method "unsharpen" to "apply_unsharp"
Stefano Sabatini [Fri, 12 Aug 2011 06:47:09 +0000 (08:47 +0200)]
vf_unsharp: rename method "unsharpen" to "apply_unsharp"

More consistent with the original libmpcodecs code, and the name
"unsharpen" was confusing.

7 years agoffmpeg: fix null pointer segfault on solaris. (ticket381)
Michael Niedermayer [Sat, 13 Aug 2011 12:16:55 +0000 (14:16 +0200)]
ffmpeg: fix null pointer segfault on solaris. (ticket381)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavconv: remove trailing whitespace
Michael Niedermayer [Sat, 13 Aug 2011 12:27:06 +0000 (14:27 +0200)]
avconv: remove trailing whitespace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoset Release to 0.8.2.git. We are at 0.8.2 and a bit further.
Dominique Leuenberger [Fri, 12 Aug 2011 22:42:33 +0000 (00:42 +0200)]
set Release to 0.8.2.git. We are at 0.8.2 and a bit further.

7 years agomov: Set negative Sample_duration in STTS to 1
Thierry Foucu [Fri, 12 Aug 2011 23:27:59 +0000 (16:27 -0700)]
mov: Set negative Sample_duration in STTS to 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/avconv.texi: fixup a few ff/av references
Michael Niedermayer [Sat, 13 Aug 2011 01:31:12 +0000 (03:31 +0200)]
doc/avconv.texi: fixup a few ff/av references

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 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>
7 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>
7 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>
7 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>
7 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>
7 years agoswscale: add dithering to yuv2yuvX_altivec_real
Luca Barbato [Wed, 10 Aug 2011 00:16:26 +0000 (02:16 +0200)]
swscale: add dithering to yuv2yuvX_altivec_real

It just does that part in scalar form, I doubt using a vector store
over 2 array would speed it up particularly.

The function should be written to not use a scratch buffer.

7 years agorv34: free+allocate buffer instead of reallocating it to preserve alignment
Kostya Shishkov [Fri, 12 Aug 2011 19:50:28 +0000 (21:50 +0200)]
rv34: free+allocate buffer instead of reallocating it to preserve alignment

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoh264: add missing brackets.
Ronald S. Bultje [Fri, 12 Aug 2011 19:32:31 +0000 (12:32 -0700)]
h264: add missing brackets.

This caused failure of a few fate tests.

7 years agoswscale: use 15-bit intermediates for 9/10-bit scaling.
Ronald S. Bultje [Tue, 2 Aug 2011 22:42:35 +0000 (15:42 -0700)]
swscale: use 15-bit intermediates for 9/10-bit scaling.

7 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.

7 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.

7 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>
7 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>
7 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.

7 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.

7 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.

7 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>
7 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>
7 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.

7 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.

7 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.

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

7 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.

7 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.

7 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.

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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.

7 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.

7 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)

7 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.

7 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.

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

7 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).

7 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

7 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>
7 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

7 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>
7 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>
7 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.

7 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.

7 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]

7 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]

7 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]

7 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>
7 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>
7 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>
7 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>
7 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>
7 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.

7 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.

7 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.).

7 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>
7 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.

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

7 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

7 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.