ffmpeg.git
9 years agoffmpeg: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
ffmpeg: Replace av_realloc by av_realloc_f when relevant.

Also mark with a visible comment "FIXME realloc failure" places where
av_realloc seems to lack a proper test for failure.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoIntroduce av_realloc_f.
Nicolas George [Sun, 20 Mar 2011 18:39:20 +0000 (19:39 +0100)]
Introduce av_realloc_f.

av_realloc_f helps avoiding memory-leaks in typical uses of realloc.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoIntroduce av_size_mult.
Nicolas George [Sun, 20 Mar 2011 18:39:20 +0000 (19:39 +0100)]
Introduce av_size_mult.

av_size_mult helps checking for overflow when computing the size of a memory
area.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibx264: remove check_default_settings()
Michael Niedermayer [Wed, 28 Sep 2011 13:11:19 +0000 (15:11 +0200)]
libx264: remove check_default_settings()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffprobe: fix trailing '=' in stream id.
Clément Bœsch [Wed, 28 Sep 2011 15:57:22 +0000 (17:57 +0200)]
ffprobe: fix trailing '=' in stream id.

9 years agolavfi: fix FF_API_* definition macros
Stefano Sabatini [Wed, 28 Sep 2011 13:41:28 +0000 (15:41 +0200)]
lavfi: fix FF_API_* definition macros

Fix ABI break occurred after their use.

Bug reported and patch provided by chinsou, fix trac issue #516,
+80cola for me.

9 years agoswresample: remove unused variable.
Nicolas George [Sun, 25 Sep 2011 11:36:03 +0000 (13:36 +0200)]
swresample: remove unused variable.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibswr/rematrix: remove unused variable.
Nicolas George [Sun, 25 Sep 2011 11:35:03 +0000 (13:35 +0200)]
libswr/rematrix: remove unused variable.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibswr/rematrix: add braces to silence a warning.
Nicolas George [Sun, 25 Sep 2011 11:24:40 +0000 (13:24 +0200)]
libswr/rematrix: add braces to silence a warning.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobintext: remove unused variable.
Nicolas George [Sun, 25 Sep 2011 11:12:05 +0000 (13:12 +0200)]
bintext: remove unused variable.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_boxblur: remove useless code.
Nicolas George [Sun, 25 Sep 2011 11:10:15 +0000 (13:10 +0200)]
vf_boxblur: remove useless code.

This block was probably leftovers from code refactoring.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kdec: use correct printf format.
Nicolas George [Sun, 25 Sep 2011 10:34:05 +0000 (12:34 +0200)]
j2kdec: use correct printf format.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: Fix pointer<->integer casts.
Michael Niedermayer [Wed, 28 Sep 2011 13:18:49 +0000 (15:18 +0200)]
j2kenc: Fix pointer<->integer casts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: dont set key_frame when the frame is not a real keyframe.
Michael Niedermayer [Wed, 28 Sep 2011 01:47:39 +0000 (03:47 +0200)]
h264: dont set key_frame when the frame is not a real keyframe.
Fixes Ticket514

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc/ffmpeg.texi: merge changes from avconv.texi since last merge
Michael Niedermayer [Wed, 28 Sep 2011 00:57:34 +0000 (02:57 +0200)]
doc/ffmpeg.texi: merge changes from avconv.texi since last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: fix forgotten codec_name checks
Michael Niedermayer [Wed, 28 Sep 2011 01:05:33 +0000 (03:05 +0200)]
ffplay: fix forgotten codec_name checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix wrong indention that leaked in from merge
Michael Niedermayer [Wed, 28 Sep 2011 00:11:07 +0000 (02:11 +0200)]
ffmpeg: fix wrong indention that leaked in from merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for out of bound reads in the flic decoder.
Laurent Aimar [Tue, 27 Sep 2011 20:05:15 +0000 (22:05 +0200)]
Check for out of bound reads in the flic decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Sep 2011 23:31:38 +0000 (01:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: use different variables for decoded and filtered frame.
  avconv: add support for copying attachments.
  matroskaenc: write attachments.
  matroskadec: export mimetype of attachments as metadata.
  avconv: factorize common code from new_*_stream()
  doc/avconv: expand documentation for some options.
  doc/avconv: document -timelimit.

Conflicts:
avconv.c
cmdutils.c
tests/codec-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoPrevent out of bound accesses in the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:53:47 +0000 (23:53 +0200)]
Prevent out of bound accesses in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for invalid/corrupted bitstream in sun raster decoder.
Laurent Aimar [Tue, 27 Sep 2011 19:24:03 +0000 (21:24 +0200)]
Check for invalid/corrupted bitstream in sun raster decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoPrevent NULL dereferences when missing the reference frame in the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:57 +0000 (23:43 +0200)]
Prevent NULL dereferences when missing the reference frame in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for out of bounds reads in sun rasterfile decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:53 +0000 (23:43 +0200)]
Check for out of bounds reads in sun rasterfile decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for corrupted extra data in wmavoice decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:52 +0000 (23:43 +0200)]
Check for corrupted extra data in wmavoice decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for out of bound writes in the wmavoice decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:51 +0000 (23:43 +0200)]
Check for out of bound writes in the wmavoice decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoPrevent NULL dereferences when missing the reference frame in the bink decoder.
Laurent Aimar [Tue, 27 Sep 2011 18:22:13 +0000 (20:22 +0200)]
Prevent NULL dereferences when missing the reference frame in the bink decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomxf: Add PictureEssenceCoding UL for V210
Tomas Härdin [Mon, 26 Sep 2011 09:24:11 +0000 (11:24 +0200)]
mxf: Add PictureEssenceCoding UL for V210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay.texi: document -codec
Michael Niedermayer [Tue, 27 Sep 2011 20:00:20 +0000 (22:00 +0200)]
ffplay.texi: document -codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: support -codec:avs to force a specific decoder implementation
Michael Niedermayer [Tue, 27 Sep 2011 19:56:20 +0000 (21:56 +0200)]
ffplay: support -codec:avs to force a specific decoder implementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoregression tests: add jpeg2000
Michael Niedermayer [Tue, 27 Sep 2011 19:13:34 +0000 (21:13 +0200)]
regression tests: add jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: Fix use of value before its initialized.
Michael Niedermayer [Tue, 27 Sep 2011 19:27:17 +0000 (21:27 +0200)]
j2kenc: Fix use of value before its initialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: only list pixel formats that fully work currently.
Michael Niedermayer [Tue, 27 Sep 2011 19:04:35 +0000 (21:04 +0200)]
j2kenc: only list pixel formats that fully work currently.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: fix colors on yuv444
Michael Niedermayer [Tue, 27 Sep 2011 19:02:02 +0000 (21:02 +0200)]
j2kenc: fix colors on yuv444

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoimg2enc: show first 4 bytes if a malformed jpeg2000 codestream is detected
Michael Niedermayer [Tue, 27 Sep 2011 18:46:48 +0000 (20:46 +0200)]
img2enc: show first 4 bytes if a malformed jpeg2000 codestream is detected

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoimg2enc: Accept raw jpeg2000 codestream too,
Michael Niedermayer [Tue, 27 Sep 2011 18:45:59 +0000 (20:45 +0200)]
img2enc: Accept raw jpeg2000 codestream too,
 our decoder outputs that, jasper can as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRELEASE: set to 0.8.4.git after the release from 2011-09-22
Dominique Leuenberger [Tue, 27 Sep 2011 14:56:49 +0000 (16:56 +0200)]
RELEASE: set to 0.8.4.git after the release from 2011-09-22

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: enable 4:2:0 YUV it works as "well" as the other subsampled yuv formats
Michael Niedermayer [Tue, 27 Sep 2011 17:25:43 +0000 (19:25 +0200)]
j2kenc: enable 4:2:0 YUV it works as "well" as the other subsampled yuv formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobuild system: enable j2kenc
Michael Niedermayer [Tue, 27 Sep 2011 17:25:17 +0000 (19:25 +0200)]
build system: enable j2kenc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: fix coded_frame and prevent null pointer dereference.
Michael Niedermayer [Tue, 27 Sep 2011 17:24:31 +0000 (19:24 +0200)]
j2kenc: fix coded_frame and prevent null pointer dereference.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: Update ff_j2k_init_component() arguments
Michael Niedermayer [Tue, 27 Sep 2011 17:18:40 +0000 (19:18 +0200)]
j2kenc: Update ff_j2k_init_component() arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: fix arguments for ff_j2k_getnbctxno()
Michael Niedermayer [Tue, 27 Sep 2011 17:11:08 +0000 (19:11 +0200)]
j2kenc: fix arguments for ff_j2k_getnbctxno()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: mark as experimental.
Michael Niedermayer [Tue, 27 Sep 2011 17:02:13 +0000 (19:02 +0200)]
j2kenc: mark as experimental.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: s/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/
Michael Niedermayer [Tue, 27 Sep 2011 17:01:37 +0000 (19:01 +0200)]
j2kenc: s/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: update codec name to modern ffmpeg
Michael Niedermayer [Tue, 27 Sep 2011 17:00:55 +0000 (19:00 +0200)]
j2kenc: update codec name to modern ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: cleanup() is not used outside thus it is static
Michael Niedermayer [Tue, 27 Sep 2011 17:00:21 +0000 (19:00 +0200)]
j2kenc: cleanup() is not used outside thus it is static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoj2kenc: update function name.
Michael Niedermayer [Tue, 27 Sep 2011 16:59:37 +0000 (18:59 +0200)]
j2kenc: update function name.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: use different variables for decoded and filtered frame.
Anton Khirnov [Fri, 23 Sep 2011 14:17:42 +0000 (16:17 +0200)]
avconv: use different variables for decoded and filtered frame.

Makes the code less obfuscated and fixes encoding one video stream to
several outputs.

Also use avcodec_alloc_frame() instead of allocating AVFrame on stack.

Breaks me_threshold in avconv, as motion vectors aren't passed through
lavfi. They could be copied manually, but I don't think this misfeature
is useful enough to justify ugly hacks.

9 years agoavconv: add support for copying attachments.
Anton Khirnov [Tue, 27 Sep 2011 08:37:22 +0000 (10:37 +0200)]
avconv: add support for copying attachments.

9 years agomatroskaenc: write attachments.
Anton Khirnov [Sat, 30 Jul 2011 11:37:36 +0000 (13:37 +0200)]
matroskaenc: write attachments.

9 years agomatroskadec: export mimetype of attachments as metadata.
Anton Khirnov [Tue, 27 Sep 2011 08:36:53 +0000 (10:36 +0200)]
matroskadec: export mimetype of attachments as metadata.

9 years agoavconv: factorize common code from new_*_stream()
Anton Khirnov [Tue, 27 Sep 2011 05:42:29 +0000 (07:42 +0200)]
avconv: factorize common code from new_*_stream()

9 years agodoc/avconv: expand documentation for some options.
Anton Khirnov [Mon, 12 Sep 2011 19:03:52 +0000 (21:03 +0200)]
doc/avconv: expand documentation for some options.

9 years agodoc/avconv: document -timelimit.
Anton Khirnov [Mon, 12 Sep 2011 18:40:29 +0000 (20:40 +0200)]
doc/avconv: document -timelimit.

9 years agomxfdec: Consider QuantizationBits between 17 and 24 to be pcm_s24*
Tomas Härdin [Tue, 27 Sep 2011 09:14:59 +0000 (11:14 +0200)]
mxfdec: Consider QuantizationBits between 17 and 24 to be pcm_s24*

This fixes playback of BRD38772509.mxf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for out of bound writes when building tree in bink decoder.
Laurent Aimar [Mon, 26 Sep 2011 23:02:17 +0000 (01:02 +0200)]
Check for out of bound writes when building tree in bink decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for various out of bound writes in the bink decoder.
Laurent Aimar [Mon, 26 Sep 2011 23:02:16 +0000 (01:02 +0200)]
Check for various out of bound writes in the bink decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswfdec: return correct error code at EOF
Tanami, Ohad [Tue, 27 Sep 2011 12:48:56 +0000 (14:48 +0200)]
swfdec: return correct error code at EOF

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix typo in warning
Lars Täuber [Tue, 27 Sep 2011 12:41:09 +0000 (14:41 +0200)]
ffmpeg: fix typo in warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Sep 2011 00:14:37 +0000 (02:14 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
avconv.c
cmdutils.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/oggparsecelt.c
libavformat/utils.c
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoReset internal state on corrupted blocks in wavpack decoder.
Laurent Aimar [Mon, 26 Sep 2011 21:37:30 +0000 (23:37 +0200)]
Reset internal state on corrupted blocks in wavpack decoder.

wavpack_decode_block() supposes that it is called back with the exact
same buffer unless it has returned with an error. With multi-channels
files, wavpack_decode_frame() was breaking this assumption.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoValidate the number of audio channels before using it in wmapro decoder.
Laurent Aimar [Mon, 26 Sep 2011 21:37:29 +0000 (23:37 +0200)]
Validate the number of audio channels before using it in wmapro decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: allow testing with libavfilter disabled
Mans Rullgard [Sun, 17 Jul 2011 10:55:08 +0000 (11:55 +0100)]
fate: allow testing with libavfilter disabled

This declares dependencies to skip tests using libavfilter
when it is disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agox86: XOP/FMA4 CPU detection support
Jason Garrett-Glaser [Mon, 26 Sep 2011 21:44:47 +0000 (14:44 -0700)]
x86: XOP/FMA4 CPU detection support

9 years agows_snd: misc cosmetic clean-ups
Justin Ruggles [Mon, 12 Sep 2011 14:28:56 +0000 (10:28 -0400)]
ws_snd: misc cosmetic clean-ups

9 years agows_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
Justin Ruggles [Mon, 12 Sep 2011 14:22:31 +0000 (10:22 -0400)]
ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.

9 years agows_snd: use memcpy() and memset() instead of loops
Justin Ruggles [Mon, 12 Sep 2011 14:04:37 +0000 (10:04 -0400)]
ws_snd: use memcpy() and memset() instead of loops

9 years agows_snd: use samples pointer for loop termination instead of a separate
Justin Ruggles [Mon, 12 Sep 2011 13:59:13 +0000 (09:59 -0400)]
ws_snd: use samples pointer for loop termination instead of a separate
iterator variable.

9 years agows_snd: make sure number of channels is 1
Justin Ruggles [Mon, 12 Sep 2011 13:44:21 +0000 (09:44 -0400)]
ws_snd: make sure number of channels is 1

9 years agoffmpeg: document alternative to the lossless libx264 presets
Michael Niedermayer [Mon, 26 Sep 2011 20:02:13 +0000 (22:02 +0200)]
ffmpeg: document alternative to the lossless libx264 presets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoremove libx264 lossless presets
Lou Logan [Mon, 26 Sep 2011 20:02:52 +0000 (22:02 +0200)]
remove libx264 lossless presets

It is simpler and more consistent to use "-preset $speed -qp 0" for
lossless. Also, the old presets encode slower.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agows_snd: add some checks to prevent buffer overread or overwrite.
Justin Ruggles [Mon, 12 Sep 2011 13:41:06 +0000 (09:41 -0400)]
ws_snd: add some checks to prevent buffer overread or overwrite.

9 years agows_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
Justin Ruggles [Mon, 12 Sep 2011 12:55:43 +0000 (08:55 -0400)]
ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.

8-bit unsigned is the native sample format.

9 years agoflacdec: fix buffer size checking in get_metadata_size()
Justin Ruggles [Tue, 13 Sep 2011 19:13:44 +0000 (15:13 -0400)]
flacdec: fix buffer size checking in get_metadata_size()

Adds an additional check before reading the next block header and avoids a
potential integer overflow when checking the metadata size against the
remaining buffer size.

9 years agoffmpeg: fix -b -ab mixes with -b overriding the audio bitrate
Michael Niedermayer [Mon, 26 Sep 2011 18:35:48 +0000 (20:35 +0200)]
ffmpeg: fix -b -ab mixes with -b overriding the audio bitrate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortp: Simplify ff_rtp_get_payload_type
Rafaël Carré [Mon, 26 Sep 2011 15:56:49 +0000 (11:56 -0400)]
rtp: Simplify ff_rtp_get_payload_type

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpenc: Add a payload type private option
Rafaël Carré [Mon, 26 Sep 2011 15:56:48 +0000 (11:56 -0400)]
rtpenc: Add a payload type private option

Specifying the payload type is useful when the type number has
already been negotiated before creating the stream, for example
in SIP protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortp: Correct ff_rtp_get_payload_type documentation
Rafaël Carré [Mon, 26 Sep 2011 15:56:47 +0000 (11:56 -0400)]
rtp: Correct ff_rtp_get_payload_type documentation

Since 0c378ea1f, it can't fail anymore.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavconv: replace all fprintf() by av_log().
Anton Khirnov [Tue, 13 Sep 2011 05:31:21 +0000 (07:31 +0200)]
avconv: replace all fprintf() by av_log().

Deprecate -v option, now only -loglevel is enough.

9 years agoavconv: change av_log verbosity from ERROR to FATAL for fatal errors.
Anton Khirnov [Mon, 12 Sep 2011 19:51:02 +0000 (21:51 +0200)]
avconv: change av_log verbosity from ERROR to FATAL for fatal errors.

9 years agocmdutils: replace fprintf() by av_log()
Anton Khirnov [Mon, 26 Sep 2011 06:39:43 +0000 (08:39 +0200)]
cmdutils: replace fprintf() by av_log()

This way, all messages can be easily disabled with -loglevel.

Behavior change -- configuration is printed with AV_LOG_VERBOSE, so it's
not shown by default.

9 years agoavtools: parse loglevel before all the other options.
Anton Khirnov [Mon, 26 Sep 2011 06:15:37 +0000 (08:15 +0200)]
avtools: parse loglevel before all the other options.

This way it can be applied to cmdutils too -- e.g. showing the banner
and printing startup messages.

9 years agolibx264: free x4->sei
Michael Niedermayer [Mon, 26 Sep 2011 16:53:12 +0000 (18:53 +0200)]
libx264: free x4->sei

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix a buffer overflow in libx264 interface to x264 encoder. Previous code ignored...
Mike Scheutzow [Mon, 26 Sep 2011 14:57:53 +0000 (10:57 -0400)]
Fix a buffer overflow in libx264 interface to x264 encoder. Previous code ignored the compressed buffer size passed in. This change returns as many complete NALs as can fit in the buffer, and logs an error message.

Signed-off-by: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agooggdec: add support for Xiph's CELT codec
Nicolas George [Mon, 26 Sep 2011 11:19:05 +0000 (13:19 +0200)]
oggdec: add support for Xiph's CELT codec

This patch also introduces CODEC_ID_CELT.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agolibaac+ support
tipok [Mon, 26 Sep 2011 00:28:21 +0000 (02:28 +0200)]
libaac+ support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomjpegenc: use named struct initializers
Aurelien Jacobs [Sun, 25 Sep 2011 22:24:38 +0000 (00:24 +0200)]
mjpegenc: use named struct initializers

9 years agoact: correct file description comment
Aurelien Jacobs [Sun, 25 Sep 2011 22:24:01 +0000 (00:24 +0200)]
act: correct file description comment

9 years agoact, bintext, wtvenc: use named struct initializers
Aurelien Jacobs [Sun, 25 Sep 2011 22:19:56 +0000 (00:19 +0200)]
act, bintext, wtvenc: use named struct initializers

9 years agoh264dec: fix decoding problems introduced with baad01d8b4bfe63c7c4e571ed553f7845d78d9c0.
Michael Niedermayer [Sun, 25 Sep 2011 21:51:32 +0000 (23:51 +0200)]
h264dec: fix decoding problems introduced with baad01d8b4bfe63c7c4e571ed553f7845d78d9c0.
This affected cases where extradata was not set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 25 Sep 2011 21:30:25 +0000 (23:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: fix some pointer to integer casts
  ppc: fix 32-bit PIC build
  vmdaudio: fix decoding of 16-bit audio format.
  lavf: do not set codec_tag for rawvideo
  h264: check for out of bounds reads in ff_h264_decode_extradata().
  flvdec: Check for overflow before allocating arrays
  avconv: use correct output stream index when checking max_frames
  avconv: remove fake coded_frame on streamcopy hack

Conflicts:
avconv.c
libavcodec/h264.c
libavcodec/ppc/asm.S
libavcodec/vmdav.c
libavformat/flvdec.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoCheck for out of bound bands limit in mpc v8 decoder.
Laurent Aimar [Sun, 25 Sep 2011 11:43:38 +0000 (13:43 +0200)]
Check for out of bound bands limit in mpc v8 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix return value on EOF in mpc v8 demuxer.
Laurent Aimar [Sun, 25 Sep 2011 11:43:37 +0000 (13:43 +0200)]
Fix return value on EOF in mpc v8 demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoid3v2: Fix some (function) pointer types.
Reimar Döffinger [Sun, 25 Sep 2011 14:58:38 +0000 (16:58 +0200)]
id3v2: Fix some (function) pointer types.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFixed NULL pointer dereference in id3v2 parser.
Laurent Aimar [Sat, 24 Sep 2011 22:38:23 +0000 (00:38 +0200)]
Fixed NULL pointer dereference in id3v2 parser.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agog729dec: avoid unnecessary struct copying
Vitor Sessak [Sun, 25 Sep 2011 19:37:35 +0000 (21:37 +0200)]
g729dec: avoid unnecessary struct copying

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agog729dec: remove useless headers
Vitor Sessak [Sun, 25 Sep 2011 19:37:34 +0000 (21:37 +0200)]
g729dec: remove useless headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosol: return error if av_get_packet() fails.
Justin Ruggles [Sat, 24 Sep 2011 01:43:43 +0000 (21:43 -0400)]
sol: return error if av_get_packet() fails.

This prevents sending a packet with data=NULL size=AVERROR_EOF.

9 years agovf_drawtext: apply misc style fixes
Stefano Sabatini [Sun, 25 Sep 2011 20:38:32 +0000 (22:38 +0200)]
vf_drawtext: apply misc style fixes

9 years agovf_drawtext: do not reset "n" variable to 0 in case the filter is reinited
Stefano Sabatini [Fri, 23 Sep 2011 13:37:47 +0000 (15:37 +0200)]
vf_drawtext: do not reset "n" variable to 0 in case the filter is reinited

9 years agoffmpeg: improve feedback when processing filtergraph events
Stefano Sabatini [Sat, 24 Sep 2011 11:57:26 +0000 (13:57 +0200)]
ffmpeg: improve feedback when processing filtergraph events