ffmpeg.git
9 years agoIn libx264 wrapper, detect default settings and use medium profile to avoid failure.
Baptiste Coudurier [Thu, 21 Apr 2011 16:01:31 +0000 (09:01 -0700)]
In libx264 wrapper, detect default settings and use medium profile to avoid failure.

9 years agoimg2: return AVERROR(EINVAL) in case of invalid filename pattern
Stefano Sabatini [Sun, 10 Apr 2011 22:39:59 +0000 (00:39 +0200)]
img2: return AVERROR(EINVAL) in case of invalid filename pattern

In write_packet(), return AVERROR(EINVAL) rather than AVERROR(EIO) if
the provided output filename pattern is not valid. Indeed this has to
be considered a configuration error rather than an I/O error.

Allow a less confusing error report.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffmpeg: call pre_process_video_frame() only if decoding is needed
Stefano Sabatini [Wed, 20 Apr 2011 11:13:09 +0000 (13:13 +0200)]
ffmpeg: call pre_process_video_frame() only if decoding is needed

In output_packet(), move the pre_process_video_frame() call inside the
if (ist->decoding_needed) { } block. This way
pre_process_video_frame() is not called when stream-copy has been
selected.

Also simplify.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX
Stefano Sabatini [Thu, 21 Apr 2011 08:31:48 +0000 (10:31 +0200)]
ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX

Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Thu, 21 Apr 2011 01:23:46 +0000 (03:23 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  Makefile: Include dependencies for test tools, too
  Remove a version check in av_log made unnecessary by the big bump.
  update last major version increase dates in APIchanges
  Reduce picture size for yadif.
  oggdec: use av_freep() instead of av_free()
  avio: Fix sanity checks in ffurl_read*
  libavformat: Free AVFormatContext->streams
  libavformat: Make protocols pass URLContext as log context where available
  asf: remove commented out code in asf_read_seek
not pulled:  libpostproc: Remove crufty code disabled by the big bump.
  Reflect 0.7_beta1 release in the Changelog
not pulled:  sws: remove disabled cruft.
  lavu: remove disabled ff_random_get_seed cruft.
  lavu: remove disabled sha1 cruft.

Conflicts:
Changelog
libavutil/sha1.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoIn libx264 wrapper, correctly support 2pass log filename option.
Baptiste Coudurier [Wed, 20 Apr 2011 22:46:20 +0000 (15:46 -0700)]
In libx264 wrapper, correctly support 2pass log filename option.

9 years agoMakefile: Include dependencies for test tools, too
Martin Storsjö [Wed, 20 Apr 2011 18:22:08 +0000 (21:22 +0300)]
Makefile: Include dependencies for test tools, too

This makes seek_test to be rebuilt when its dependencies
has changed. The changes to the dependencies didn't usually matter
in practice, but the introduction of side data in AVPacket required
a recompilation.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoRemove a version check in av_log made unnecessary by the big bump.
Diego Biurrun [Wed, 20 Apr 2011 15:18:27 +0000 (17:18 +0200)]
Remove a version check in av_log made unnecessary by the big bump.

9 years agoavio: fix AVIO_FLAG_READ/WRITE test in ffurl_*.
Nicolas George [Wed, 20 Apr 2011 16:13:54 +0000 (18:13 +0200)]
avio: fix AVIO_FLAG_READ/WRITE test in ffurl_*.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
9 years agoupdate last major version increase dates in APIchanges
Justin Ruggles [Tue, 19 Apr 2011 23:37:29 +0000 (19:37 -0400)]
update last major version increase dates in APIchanges

9 years agoReduce picture size for yadif.
Michael Niedermayer [Wed, 23 Mar 2011 04:31:01 +0000 (04:31 +0000)]
Reduce picture size for yadif.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agooggdec: use av_freep() instead of av_free()
Michael Niedermayer [Tue, 12 Apr 2011 04:22:31 +0000 (04:22 +0000)]
oggdec: use av_freep() instead of av_free()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavio: Fix sanity checks in ffurl_read*
Martin Storsjö [Wed, 20 Apr 2011 14:09:46 +0000 (17:09 +0300)]
avio: Fix sanity checks in ffurl_read*

This fixes e.g. reading data over HTTP, where the underlying
socket is set to read/write.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolibavformat: Free AVFormatContext->streams
Martin Storsjö [Wed, 20 Apr 2011 09:03:55 +0000 (12:03 +0300)]
libavformat: Free AVFormatContext->streams

After switching this from a statically allocated array to a
dynamically allocated one in the major bump, this needs explicit
freeing.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agolibavformat: Make protocols pass URLContext as log context where available
Martin Storsjö [Wed, 20 Apr 2011 09:40:29 +0000 (11:40 +0200)]
libavformat: Make protocols pass URLContext as log context where available

Since the libavformat major bump, URLContext contains an AVClass,
making it a usable log context.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoasf: remove commented out code in asf_read_seek
Vladimir Pantelic [Wed, 20 Apr 2011 10:31:10 +0000 (12:31 +0200)]
asf: remove commented out code in asf_read_seek

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agolibpostproc: Remove crufty code disabled by the big bump.
Diego Biurrun [Tue, 19 Apr 2011 19:53:48 +0000 (21:53 +0200)]
libpostproc: Remove crufty code disabled by the big bump.

9 years agoXiph CELT/Opus decoder using libcelt.
Nicolas George [Sat, 16 Apr 2011 15:45:30 +0000 (17:45 +0200)]
Xiph CELT/Opus decoder using libcelt.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
9 years agoMove the info union to the end of the vdpau_render_state struct.
Carl Eugen Hoyos [Wed, 20 Apr 2011 07:44:08 +0000 (09:44 +0200)]
Move the info union to the end of the vdpau_render_state struct.

9 years agoReflect 0.7_beta1 release in the Changelog
Reinhard Tartler [Tue, 19 Apr 2011 17:48:44 +0000 (19:48 +0200)]
Reflect 0.7_beta1 release in the Changelog

9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Wed, 20 Apr 2011 02:48:23 +0000 (04:48 +0200)]
Merge remote branch 'qatar/master'

* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoIn libx264 wrapper, add -level specific option.
Baptiste Coudurier [Tue, 19 Apr 2011 23:12:13 +0000 (16:12 -0700)]
In libx264 wrapper, add -level specific option.

9 years agoFix libx264 fastfirstpass, move apply_fastfirstpass after user customized options.
Baptiste Coudurier [Tue, 19 Apr 2011 22:23:36 +0000 (15:23 -0700)]
Fix libx264 fastfirstpass, move apply_fastfirstpass after user customized options.

9 years agooggparsecelt: cosmetic: order lines more logically.
Nicolas George [Tue, 19 Apr 2011 21:36:29 +0000 (23:36 +0200)]
oggparsecelt: cosmetic: order lines more logically.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
9 years agooggparsecelt: call av_set_pts_info unconditionally.
Nicolas George [Tue, 19 Apr 2011 21:03:51 +0000 (23:03 +0200)]
oggparsecelt: call av_set_pts_info unconditionally.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
9 years agoIn libx264 wrapper, do not set pic quality if no frame is output, avoids
Baptiste Coudurier [Sun, 30 Jan 2011 01:05:42 +0000 (17:05 -0800)]
In libx264 wrapper, do not set pic quality if no frame is output, avoids
uninitialized reads.

9 years agoPrefer codec specific options over global ones, allowing codec
Baptiste Coudurier [Tue, 19 Apr 2011 19:57:46 +0000 (12:57 -0700)]
Prefer codec specific options over global ones, allowing codec
to override global options.

9 years agosws: remove disabled cruft.
Anton Khirnov [Tue, 19 Apr 2011 19:25:10 +0000 (21:25 +0200)]
sws: remove disabled cruft.

9 years agolavu: remove disabled ff_random_get_seed cruft.
Anton Khirnov [Tue, 19 Apr 2011 19:21:44 +0000 (21:21 +0200)]
lavu: remove disabled ff_random_get_seed cruft.

9 years agolavu: remove disabled sha1 cruft.
Anton Khirnov [Tue, 19 Apr 2011 19:16:35 +0000 (21:16 +0200)]
lavu: remove disabled sha1 cruft.

9 years agoIn avcodec_open(), set return code to an error value only when an error occurs
Justin Ruggles [Sun, 17 Apr 2011 20:57:55 +0000 (16:57 -0400)]
In avcodec_open(), set return code to an error value only when an error occurs
instead of unconditionally at the start of the function.

This fixes a bug where a successful call to ff_thread_init() masks errors that
occur after that point in the function.  It also makes future bugs like this
less likely since the error code is now set near to the point in the code
where the error is found.

9 years agolavc: remove reference to opt.h from Makefile.
Anton Khirnov [Tue, 19 Apr 2011 17:50:23 +0000 (19:50 +0200)]
lavc: remove reference to opt.h from Makefile.

Fixes make install after 3453a231a6cebe5989c213be0f9fd6c71ec5ea23.

9 years agoprefer avio_check() over url_exist()
Stefano Sabatini [Fri, 8 Apr 2011 23:32:37 +0000 (01:32 +0200)]
prefer avio_check() over url_exist()

The problem with url_exist() is that it tries to open a resource in
RDONLY mode. If the file is a FIFO and there is already a reading
client, the open() call will hang.

By using avio_check() with access mode of 0, the second reading
process will check if the file exists without attempting to open it,
thus avoiding the lock.

Fix issue #1663.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoavio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
Stefano Sabatini [Fri, 15 Apr 2011 14:42:09 +0000 (16:42 +0200)]
avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols

Make AVIO_FLAG_ access constants work as flags, and in particular fix
the behavior of functions (such as avio_check()) which expect them to
be flags rather than modes.

This breaks API.

9 years agolavu: remove misc disabled cruft
Anton Khirnov [Tue, 12 Apr 2011 19:17:26 +0000 (21:17 +0200)]
lavu: remove misc disabled cruft

9 years agolavu: remove FF_API_OLD_IMAGE_NAMES cruft
Anton Khirnov [Tue, 12 Apr 2011 19:11:15 +0000 (21:11 +0200)]
lavu: remove FF_API_OLD_IMAGE_NAMES cruft

9 years agolavu: remove FF_API_OLD_EVAL_NAMES cruft
Anton Khirnov [Tue, 12 Apr 2011 18:57:07 +0000 (20:57 +0200)]
lavu: remove FF_API_OLD_EVAL_NAMES cruft

9 years agolavc: remove misc disabled cruft.
Anton Khirnov [Tue, 12 Apr 2011 18:46:49 +0000 (20:46 +0200)]
lavc: remove misc disabled cruft.

9 years agolavc: remove the FF_API_INOFFICIAL cruft.
Anton Khirnov [Thu, 3 Feb 2011 14:00:50 +0000 (15:00 +0100)]
lavc: remove the FF_API_INOFFICIAL cruft.

9 years agolavc: remove the FF_API_SET_STRING_OLD cruft.
Anton Khirnov [Thu, 3 Feb 2011 13:58:59 +0000 (14:58 +0100)]
lavc: remove the FF_API_SET_STRING_OLD cruft.

9 years agolavc: remove the FF_API_USE_LPC cruft.
Anton Khirnov [Thu, 3 Feb 2011 13:51:50 +0000 (14:51 +0100)]
lavc: remove the FF_API_USE_LPC cruft.

9 years agolavc: remove the FF_API_SUBTITLE_OLD cruft.
Anton Khirnov [Thu, 3 Feb 2011 13:50:06 +0000 (14:50 +0100)]
lavc: remove the FF_API_SUBTITLE_OLD cruft.

9 years agolavc: remove the FF_API_VIDEO_OLD cruft.
Anton Khirnov [Thu, 3 Feb 2011 13:48:39 +0000 (14:48 +0100)]
lavc: remove the FF_API_VIDEO_OLD cruft.

9 years agolavc: remove the FF_API_AUDIO_OLD cruft.
Anton Khirnov [Thu, 3 Feb 2011 13:48:00 +0000 (14:48 +0100)]
lavc: remove the FF_API_AUDIO_OLD cruft.

9 years agolavc: remove the FF_API_OPT_SHOW cruft.
Anton Khirnov [Thu, 3 Feb 2011 13:45:22 +0000 (14:45 +0100)]
lavc: remove the FF_API_OPT_SHOW cruft.

9 years agolavc: remove the FF_API_MM_FLAGS cruft.
Anton Khirnov [Thu, 3 Feb 2011 13:43:53 +0000 (14:43 +0100)]
lavc: remove the FF_API_MM_FLAGS cruft.

9 years agolavf: remove misc disabled cruft.
Anton Khirnov [Wed, 13 Apr 2011 06:01:49 +0000 (08:01 +0200)]
lavf: remove misc disabled cruft.

9 years agolavf: remove FF_API_INDEX_BUILT cruft
Anton Khirnov [Tue, 12 Apr 2011 18:10:10 +0000 (20:10 +0200)]
lavf: remove FF_API_INDEX_BUILT cruft

9 years agolavf: remove FF_API_URL_CLASS cruft.
Anton Khirnov [Thu, 3 Feb 2011 11:53:28 +0000 (12:53 +0100)]
lavf: remove FF_API_URL_CLASS cruft.

9 years agolavf: remove FF_API_SYMVER cruft
Anton Khirnov [Thu, 3 Feb 2011 11:49:12 +0000 (12:49 +0100)]
lavf: remove FF_API_SYMVER cruft

9 years agolavf: remove FF_API_FIRST_FORMAT cruft
Anton Khirnov [Thu, 3 Feb 2011 11:47:18 +0000 (12:47 +0100)]
lavf: remove FF_API_FIRST_FORMAT cruft

9 years agolavf: remove FF_API_PARAMETERS_CODEC_ID cruft
Anton Khirnov [Thu, 3 Feb 2011 11:46:12 +0000 (12:46 +0100)]
lavf: remove FF_API_PARAMETERS_CODEC_ID cruft

9 years agolavf: remove FF_API_LAVF_UNUSED cruft
Anton Khirnov [Thu, 3 Feb 2011 11:45:30 +0000 (12:45 +0100)]
lavf: remove FF_API_LAVF_UNUSED cruft

9 years agolavf: remove FF_API_PARSE_FRAME_PARAM cruft
Anton Khirnov [Thu, 3 Feb 2011 11:44:04 +0000 (12:44 +0100)]
lavf: remove FF_API_PARSE_FRAME_PARAM cruft

9 years agolavf: remove FF_API_ALLOC_FORMAT_CONTEXT cruft
Anton Khirnov [Thu, 3 Feb 2011 11:42:38 +0000 (12:42 +0100)]
lavf: remove FF_API_ALLOC_FORMAT_CONTEXT cruft

9 years agolavf: remove FF_API_URL_SPLIT cruft
Anton Khirnov [Thu, 3 Feb 2011 11:40:25 +0000 (12:40 +0100)]
lavf: remove FF_API_URL_SPLIT cruft

9 years agolavf: remove FF_API_UDP_GET_FILE cruft
Anton Khirnov [Thu, 3 Feb 2011 11:39:11 +0000 (12:39 +0100)]
lavf: remove FF_API_UDP_GET_FILE cruft

9 years agolavf: remove FF_API_GUESS_FORMAT cruft
Anton Khirnov [Thu, 3 Feb 2011 11:38:05 +0000 (12:38 +0100)]
lavf: remove FF_API_GUESS_FORMAT cruft

9 years agolavf: remove FF_API_REGISTER_PROTOCOL cruft
Anton Khirnov [Thu, 3 Feb 2011 11:36:18 +0000 (12:36 +0100)]
lavf: remove FF_API_REGISTER_PROTOCOL cruft

9 years agolavf: remove FF_API_URL_RESETBUF cruft
Anton Khirnov [Thu, 3 Feb 2011 11:32:59 +0000 (12:32 +0100)]
lavf: remove FF_API_URL_RESETBUF cruft

9 years agolavf: remove FF_API_OLD_METADATA cruft
Anton Khirnov [Thu, 3 Feb 2011 11:30:16 +0000 (12:30 +0100)]
lavf: remove FF_API_OLD_METADATA cruft

9 years agolavf: remove FF_API_MAX_STREAMS cruft
Anton Khirnov [Thu, 3 Feb 2011 11:25:54 +0000 (12:25 +0100)]
lavf: remove FF_API_MAX_STREAMS cruft

9 years agodocument introduction of side data in APIchanges
Kostya [Mon, 18 Apr 2011 05:32:14 +0000 (05:32 +0000)]
document introduction of side data in APIchanges

this should've been written earlier, sorry

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agopcm: Add const to cast in ENCODE macro.
Diego Biurrun [Tue, 19 Apr 2011 06:47:59 +0000 (08:47 +0200)]
pcm: Add const to cast in ENCODE macro.

This fixes a lot of warnings of the sort:
libavcodec/pcm.c:105: warning: cast discards qualifiers from pointer target type

9 years agoOgg: add support for Xiph's CELT (Opus) codec.
Nicolas George [Fri, 15 Apr 2011 17:18:04 +0000 (19:18 +0200)]
Ogg: add support for Xiph's CELT (Opus) codec.

This patch also introduces CODEC_ID_CELT.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
9 years agopad: make the filter parametric
Stefano Sabatini [Sun, 17 Apr 2011 15:19:05 +0000 (17:19 +0200)]
pad: make the filter parametric

Address trac issue #61.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years ago32bit libmp3lame support.
Peter Belkner [Tue, 19 Apr 2011 10:00:01 +0000 (12:00 +0200)]
32bit libmp3lame support.

9 years agoCheck avcodec_alloc_frame() failure.
Peter Belkner [Tue, 19 Apr 2011 09:58:53 +0000 (11:58 +0200)]
Check avcodec_alloc_frame() failure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: reformat resample condition code in transcode()
Stefano Sabatini [Sat, 16 Apr 2011 21:18:22 +0000 (23:18 +0200)]
ffmpeg: reformat resample condition code in transcode()

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffmpeg: factorize resampling condition check in do_video_out()
Stefano Sabatini [Sat, 16 Apr 2011 21:11:01 +0000 (23:11 +0200)]
ffmpeg: factorize resampling condition check in do_video_out()

Simplify and improve readability.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffmpeg: prefer "dec" over "ist->st->codec" in do_video_out() snippet
Stefano Sabatini [Sat, 16 Apr 2011 23:38:09 +0000 (01:38 +0200)]
ffmpeg: prefer "dec" over "ist->st->codec" in do_video_out() snippet

Simplify, ease readability.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffmpeg: improve reporting if size/pixel format changes
Stefano Sabatini [Sat, 16 Apr 2011 20:58:13 +0000 (22:58 +0200)]
ffmpeg: improve reporting if size/pixel format changes

Use av_log() rather than fprintf(stderr, ...), and show information
related to the previous size/pixel format configuration.

Consistent with the corresponding message issued in case of audio
configuration change.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffmpeg: remove unused fields AVOutputStream.original_width/height
Stefano Sabatini [Sat, 16 Apr 2011 21:14:44 +0000 (23:14 +0200)]
ffmpeg: remove unused fields AVOutputStream.original_width/height

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoffmpeg: remove unused variable padding_src in do_video_out()
Stefano Sabatini [Sat, 16 Apr 2011 20:51:04 +0000 (22:51 +0200)]
ffmpeg: remove unused variable padding_src in do_video_out()

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoBe more verbose when printing the probe result.
Carl Eugen Hoyos [Tue, 19 Apr 2011 09:50:27 +0000 (11:50 +0200)]
Be more verbose when printing the probe result.

9 years agoFix compilation.for iOS ARMv7.
Gavin Kinsey [Tue, 19 Apr 2011 08:16:07 +0000 (10:16 +0200)]
Fix compilation.for iOS ARMv7.

9 years agoOnly ask once in the code for a TrueHD sample with strange channel layout.
Carl Eugen Hoyos [Tue, 19 Apr 2011 01:23:46 +0000 (03:23 +0200)]
Only ask once in the code for a TrueHD sample with strange channel layout.

9 years agoAlso set the MLP/TrueHD channel layout in the decoder.
Carl Eugen Hoyos [Tue, 19 Apr 2011 01:18:08 +0000 (03:18 +0200)]
Also set the MLP/TrueHD channel layout in the decoder.

Applications might not use the parser,

9 years agoMake MLP/TrueHD channel layout functions visible to the decoder.
Carl Eugen Hoyos [Tue, 19 Apr 2011 01:09:11 +0000 (03:09 +0200)]
Make MLP/TrueHD channel layout functions visible to the decoder.

9 years agoMerge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'
Michael Niedermayer [Tue, 19 Apr 2011 00:06:57 +0000 (02:06 +0200)]
Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'

* commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b':
Not pulled:  Replace mplayerhq.hu URLs by libav.org.
  asfdec: Remove dead code from asf_read_close().
  ptx: Use av_log_ask_for_sample() where appropriate.

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg:Daemon mode, add -d as first option to try it.
Michael Niedermayer [Mon, 18 Apr 2011 11:10:52 +0000 (13:10 +0200)]
ffmpeg:Daemon mode, add -d as first option to try it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg:Fix negative verbositiy
Michael Niedermayer [Mon, 18 Apr 2011 11:04:33 +0000 (13:04 +0200)]
ffmpeg:Fix negative verbositiy
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoInclude authorship information from ffmpeg-mt at Ronald S. Bultjes request.
Michael Niedermayer [Mon, 18 Apr 2011 23:07:55 +0000 (01:07 +0200)]
Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.

9 years agoRemove now obsolete references to _g-suffixed binaries.
Diego Biurrun [Mon, 18 Apr 2011 21:12:40 +0000 (23:12 +0200)]
Remove now obsolete references to _g-suffixed binaries.

Automatic stripping of binaries was removed in commit e0be794
and the _g binaries disappeared along with it.

9 years agoIn mov and flv muxer, check aac bitstream validity.
Baptiste Coudurier [Sat, 29 Jan 2011 05:32:09 +0000 (21:32 -0800)]
In mov and flv muxer, check aac bitstream validity.

9 years agolibvo-aacenc,libvo-amrwbenc}: fix api usage
Luca Barbato [Mon, 18 Apr 2011 20:12:50 +0000 (22:12 +0200)]
libvo-aacenc,libvo-amrwbenc}: fix api usage

Use the correct error codes and format identifier.

9 years agoAdded key_frame and pict_type to vsrc_movie
royger [Mon, 18 Apr 2011 15:50:16 +0000 (17:50 +0200)]
Added key_frame and pict_type to vsrc_movie

Signed-off-by: Roger Pau Monné <roger.pau@entel.upc.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAllow h264pred_init_arm.c to compile.
Bill Pringlemeir [Fri, 15 Apr 2011 17:15:23 +0000 (13:15 -0400)]
Allow h264pred_init_arm.c to compile.

SOB: Bill Pringlemeir <bpringlemeir@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoanm decoder: move buffer allocation from decode_init() to decode_frame()
Peter Ross [Fri, 15 Apr 2011 14:59:19 +0000 (00:59 +1000)]
anm decoder: move buffer allocation from decode_init() to decode_frame()

This permits playback in ffplay when libavfilter is enabled.

Resolves ticket #60

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoBump major versions of all libraries.
Anton Khirnov [Thu, 3 Feb 2011 11:18:16 +0000 (12:18 +0100)]
Bump major versions of all libraries.

They've accumulated enough new APIs and corresponding deprecated cruft.

This breaks API and ABI.

9 years agovsrc_movie: fix leak in request_frame()
Stefano Sabatini [Mon, 18 Apr 2011 17:21:25 +0000 (19:21 +0200)]
vsrc_movie: fix leak in request_frame()

Also set movie->picref to NULL, in order to avoid a crash in uninit()
when movie->picref is unreffed again and it was already freed.

Fix trac issue #66.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
9 years agoReplace mplayerhq.hu URLs by libav.org.
Diego Biurrun [Sun, 17 Apr 2011 18:13:59 +0000 (20:13 +0200)]
Replace mplayerhq.hu URLs by libav.org.

9 years agoasfdec: Remove dead code from asf_read_close().
Diego Biurrun [Sun, 17 Apr 2011 17:48:27 +0000 (19:48 +0200)]
asfdec: Remove dead code from asf_read_close().

9 years agoptx: Use av_log_ask_for_sample() where appropriate.
Diego Biurrun [Sun, 17 Apr 2011 21:42:10 +0000 (23:42 +0200)]
ptx: Use av_log_ask_for_sample() where appropriate.

9 years ago Merge remote-tracking branch 'ffmpeg-mt/master'
Alexander Strange [Sun, 17 Apr 2011 22:47:35 +0000 (00:47 +0200)]
Merge remote-tracking branch 'ffmpeg-mt/master'

    * ffmpeg-mt/master:
      Release unused pictures even when not calling ff_h264_frame_start()
      h264: Fix decoding race condition with PAFF
      h264: cosmetic whitespace change
    Duplicate  Fix REBASE_PICTURE with h.264
    Not pulled  Update test scripts to use ffmpeg instead of ffmpeg_g
    Duplicate  Fix ffmpeg-mt fixme in h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years ago10l, commit that should have been stashed into the merge.
Michael Niedermayer [Sun, 17 Apr 2011 21:57:50 +0000 (23:57 +0200)]
10l, commit that should have been stashed into the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sun, 17 Apr 2011 21:36:57 +0000 (23:36 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoUpdate regtest checksums after revision 6001dad.
Diego Biurrun [Sun, 17 Apr 2011 20:18:00 +0000 (22:18 +0200)]
Update regtest checksums after revision 6001dad.

The string "FFmpeg" was replaced by "Libav" in metadata that
got encoded in file headers.

9 years agoReplace more FFmpeg references by Libav.
Diego Biurrun [Fri, 15 Apr 2011 20:30:26 +0000 (22:30 +0200)]
Replace more FFmpeg references by Libav.

9 years agoac3dec: fix processing of delta bit allocation information.
Justin Ruggles [Sun, 17 Apr 2011 16:26:47 +0000 (12:26 -0400)]
ac3dec: fix processing of delta bit allocation information.

The number of dba segments is the coded value + 1.
The coupling dba offset starts at the first coupling band, not at zero.