ffmpeg.git
8 years agoFix building on FreeBSD8.2
Michael Niedermayer [Sun, 24 Apr 2011 11:23:51 +0000 (13:23 +0200)]
Fix building on FreeBSD8.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoHAM6/HAM8 support for IFF demuxer/decoder
Sebastian Vater [Wed, 20 Apr 2011 11:56:56 +0000 (13:56 +0200)]
HAM6/HAM8 support for IFF demuxer/decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoEA cdata demuxer: support files with 20 byte header
Peter Ross [Sat, 23 Apr 2011 12:09:19 +0000 (22:09 +1000)]
EA cdata demuxer: support files with 20 byte header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoEA cdata demuxer: support 6 channel files
Peter Ross [Sat, 23 Apr 2011 12:09:10 +0000 (22:09 +1000)]
EA cdata demuxer: support 6 channel files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoEA cdata demuxer: set codec->sample_fmt
Peter Ross [Sat, 23 Apr 2011 23:41:51 +0000 (09:41 +1000)]
EA cdata demuxer: set codec->sample_fmt

This is required by has_codec_parameters in libavformat/utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopermit decoding of multichannel ADPCM_EA_XAS
Peter Ross [Sat, 23 Apr 2011 12:08:48 +0000 (22:08 +1000)]
permit decoding of multichannel ADPCM_EA_XAS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Sun, 24 Apr 2011 01:38:03 +0000 (03:38 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
ffplay.c
ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoHandle unicode file names on windows
Kirill Gavrilov [Wed, 20 Apr 2011 11:36:44 +0000 (14:36 +0300)]
Handle unicode file names on windows

All file names should be in UTF-8 within libavformat.

This is handled by mapping the open() function to an internal one
in os_support.h for windows.

fopen() could be overridden in the same way, but if that would be
used from ffmpeg.c, it would add a dependency on an ff prefixed
internal lavf function.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortp: Rename the open/close functions to alloc/free
Martin Storsjö [Wed, 20 Apr 2011 12:36:37 +0000 (15:36 +0300)]
rtp: Rename the open/close functions to alloc/free

This avoids clashes if we internally want to override the global
open function.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoIn libx264 wrapper, fix side effect with has_b_frames, bframe_pyramid can be set
Baptiste Coudurier [Sat, 23 Apr 2011 19:41:11 +0000 (12:41 -0700)]
In libx264 wrapper, fix side effect with has_b_frames, bframe_pyramid can be set
when bframe is not.

8 years agoLowercase all ff* program names.
Diego Biurrun [Sat, 23 Apr 2011 13:19:17 +0000 (15:19 +0200)]
Lowercase all ff* program names.

8 years agoRefer to ff* tools by their lowercase names.
Diego Biurrun [Sat, 23 Apr 2011 14:40:01 +0000 (16:40 +0200)]
Refer to ff* tools by their lowercase names.

8 years agoReplace more FFmpeg instances by Libav or ffmpeg.
Diego Biurrun [Sat, 23 Apr 2011 14:39:03 +0000 (16:39 +0200)]
Replace more FFmpeg instances by Libav or ffmpeg.

8 years agoReplace `` by $() syntax in shell scripts.
Diego Biurrun [Mon, 18 Apr 2011 22:16:24 +0000 (00:16 +0200)]
Replace `` by $() syntax in shell scripts.

$() is easier to nest and POSIX, which we require in other places.

8 years agopatcheck: Allow overiding grep program(s) through environment variables.
Brad [Mon, 28 Mar 2011 01:05:22 +0000 (21:05 -0400)]
patcheck: Allow overiding grep program(s) through environment variables.

patcheck hardcodes the binary names for grep/egrep. This makes overriding the
binary names a pain, e.g. when calling a GNU version of grep on BSD systems.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoRemove stray libavcore and _g binary references.
Diego Biurrun [Sat, 23 Apr 2011 12:14:22 +0000 (14:14 +0200)]
Remove stray libavcore and _g binary references.

8 years agovorbis: Rename decoder/encoder files to follow general file naming scheme.
Diego Biurrun [Sun, 17 Apr 2011 17:44:33 +0000 (19:44 +0200)]
vorbis: Rename decoder/encoder files to follow general file naming scheme.

8 years agoaacenc: Fix whitespace after last commit.
Nathan Caldwell [Tue, 5 Apr 2011 07:05:24 +0000 (01:05 -0600)]
aacenc: Fix whitespace after last commit.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoSet channel layout in flac decoder.
Carl Eugen Hoyos [Sat, 23 Apr 2011 11:37:28 +0000 (13:37 +0200)]
Set channel layout in flac decoder.

8 years agoffplay: factorize code calling output_packet() in video_thread()
Stefano Sabatini [Fri, 22 Apr 2011 09:09:48 +0000 (11:09 +0200)]
ffplay: factorize code calling output_packet() in video_thread()

Slightly simplify.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffplay: remove reference to unused QETimer symbol
Stefano Sabatini [Fri, 22 Apr 2011 09:26:44 +0000 (11:26 +0200)]
ffplay: remove reference to unused QETimer symbol

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffplay: rename stream_pause() to stream_toggle_pause()
Stefano Sabatini [Fri, 22 Apr 2011 00:19:48 +0000 (02:19 +0200)]
ffplay: rename stream_pause() to stream_toggle_pause()

The new name is less misleading, since the function will resume the
stream if it is currently paused.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoflicvideo: fix crash on flic files with invalid frame size
Stefano Sabatini [Fri, 22 Apr 2011 22:08:28 +0000 (00:08 +0200)]
flicvideo: fix crash on flic files with invalid frame size

Add a check in flic_decode_frame_8BPP(), in case chunk_size is >
frame_size issue a warning and resize chunk_size to frame_size, in
order to avoid out-of-buffer reads.

Fix roundup issue #2520, trac issue #69.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoflicvideo: increase error level and fix error message in CHECK_PIXEL_PTR()
Stefano Sabatini [Fri, 22 Apr 2011 22:07:15 +0000 (00:07 +0200)]
flicvideo: increase error level and fix error message in CHECK_PIXEL_PTR()

Also return AVERROR_INVALIDDATA rather than -1.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agocook: Fix small typo in av_log_ask_for_sample message.
Diego Biurrun [Sat, 23 Apr 2011 00:02:42 +0000 (02:02 +0200)]
cook: Fix small typo in av_log_ask_for_sample message.

8 years agoaacenc: Finish 3GPP psymodel analysis for non mid/side cases.
Nathan Caldwell [Wed, 5 Jan 2011 08:32:16 +0000 (01:32 -0700)]
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.

There is still are still a few sections missing relating to TNS (not present)
and mid/side (contains other bugs).

Overall this improves quality, and vastly improves rate-control.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoaac: add math.h needed for log2f()
Michael Niedermayer [Sat, 23 Apr 2011 08:44:21 +0000 (10:44 +0200)]
aac: add math.h needed for log2f()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years ago10l: Add misssing CR/LF.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:41:44 +0000 (10:41 +0200)]
10l: Add misssing CR/LF.

8 years agoSupport channel layout when demuxing aif files.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:31:03 +0000 (10:31 +0200)]
Support channel layout when demuxing aif files.

8 years agoSupport channel layout when demuxing caf files.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:30:18 +0000 (10:30 +0200)]
Support channel layout when demuxing caf files.

8 years agoExtend unknown CAF chunk warning message: Print size.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:19:21 +0000 (10:19 +0200)]
Extend unknown CAF chunk warning message: Print size.

8 years agoFix compilation with libcelt on Apple OS X.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:09:11 +0000 (10:09 +0200)]
Fix compilation with libcelt on Apple OS X.

Fixes ticket #97.

8 years agoFix compilation after version bump.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:06:39 +0000 (10:06 +0200)]
Fix compilation after version bump.

8 years agoRemove RDFT dependency from AAC decoder.
Alex Converse [Thu, 21 Apr 2011 18:39:04 +0000 (18:39 +0000)]
Remove RDFT dependency from AAC decoder.

$subj

>From 557176d961c70604c2a96d81aff4bd6faa670d8a Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Thu, 21 Apr 2011 12:11:42 -0700
Subject: [PATCH] Remove RDFT dependency from AAC decoder.
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1"

This is a multi-part message in MIME format.
--------------1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

It was used for an old implementation of the SBR filterbank.

./configure --disable-everything --disable-ffplay --enable-decoder=aac works.

8 years agoAdd some debug log messages to AAC extradata
Alex Converse [Wed, 20 Apr 2011 17:47:28 +0000 (17:47 +0000)]
Add some debug log messages to AAC extradata

On Wed, Apr 20, 2011 at 11:39 AM, Justin Ruggles
<justin.ruggles@gmail.com> wrote:
> On 04/20/2011 02:26 PM, Alex Converse wrote:
>
>> ---
>>  libavcodec/aacdec.c |   10 +++++++++-
>>  1 files changed, 9 insertions(+), 1 deletions(-)
>>
>>
>>
>> 0002-Add-some-Debug-log-messages-to-AAC-extradata.patch
>>
>>
>> diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
>> index c9761a1..3ec274f 100644
>> --- a/libavcodec/aacdec.c
>> +++ b/libavcodec/aacdec.c
>> @@ -79,7 +79,6 @@
>>             Parametric Stereo.
>>   */
>>
>> -
>>  #include "avcodec.h"
>>  #include "internal.h"
>>  #include "get_bits.h"
>
>
> stray whitespace change
>

oops, fixed

>From 94e8d0eea77480630f84368c97646cabc0f50628 Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Wed, 20 Apr 2011 11:23:34 -0700
Subject: [PATCH] Add some debug log messages to AAC extradata
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1"

This is a multi-part message in MIME format.
--------------1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

8 years agoFix mov debug (u)int64_t format strings.
Alex Converse [Wed, 20 Apr 2011 17:25:47 +0000 (17:25 +0000)]
Fix mov debug (u)int64_t format strings.

8 years agobswap: use native types for av_bwap16().
Jason Garrett-Glaser [Fri, 22 Apr 2011 21:59:55 +0000 (17:59 -0400)]
bswap: use native types for av_bwap16().

This prevents a call to bytestream_get_be16() using a movzwl both before
and after the ror instruction, which is obviously inefficient. Arm uses
the same trick also.

Sintel decoding goes from (avg+SD) 9.856 +/- 0.003 to 9.797 +/- 0.003 sec.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Fri, 22 Apr 2011 23:09:43 +0000 (01:09 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  Use av_log_ask_for_sample() to request samples from users.
  Make av_log_ask_for_sample() accept a variable number of arguments.
  vqavideo: We no longer need to ask for version 1 samples.
  aacdec: indentation cosmetics

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc: FLV muxing is supported.
Carl Eugen Hoyos [Fri, 22 Apr 2011 17:24:17 +0000 (19:24 +0200)]
doc: FLV muxing is supported.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoapplehttp: Handle AES-128 encrypted streams
Martin Storsjö [Sun, 23 Jan 2011 21:42:18 +0000 (23:42 +0200)]
applehttp: Handle AES-128 encrypted streams

This should hopefully fix roundup issue 2586.

This commit only implements it in the demuxer, not in the
protocol handler. If desired, some of the code could be
refactored to be shared by both implementations.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoAdd a protocol handler for AES CBC decryption with PKCS7 padding
Martin Storsjö [Sat, 22 Jan 2011 23:31:41 +0000 (01:31 +0200)]
Add a protocol handler for AES CBC decryption with PKCS7 padding

This can later be extended to support other AES bit sizes,
encryption, other crypto algorithms, reading the key from a URL, etc.

In order to use it, the key and initialization vector has to be
passed via AVOptions. Since such options can't be passed to
protocols from the command line, the protocol is currently
only for libavformat internal use.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodoc: Mention that DragonFly BSD requires __BSD_VISIBLE set
Martin Storsjö [Thu, 21 Apr 2011 21:45:06 +0000 (00:45 +0300)]
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Setting this should fix the FATE build failure on DragonFly BSD,
since inet_aton only is visible if __BSD_VISIBLE is set.

Alternatively, a line defining __BSD_VISIBLE=1 could be
added at the top of os_support.c. For FreeBSD, similar lines
are required in libavdevice/bktr.c and libavdevice/oss_audio.c, too.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoUse av_log_ask_for_sample() to request samples from users.
Diego Biurrun [Fri, 22 Apr 2011 17:41:59 +0000 (19:41 +0200)]
Use av_log_ask_for_sample() to request samples from users.

8 years agoMake av_log_ask_for_sample() accept a variable number of arguments.
Diego Biurrun [Fri, 22 Apr 2011 17:30:25 +0000 (19:30 +0200)]
Make av_log_ask_for_sample() accept a variable number of arguments.

8 years agoRm duplicated define for OPT_STR.
Robert Leatherwood [Fri, 22 Apr 2011 18:10:26 +0000 (20:10 +0200)]
Rm duplicated define for OPT_STR.

8 years agovqavideo: We no longer need to ask for version 1 samples.
Diego Biurrun [Fri, 22 Apr 2011 17:46:54 +0000 (19:46 +0200)]
vqavideo: We no longer need to ask for version 1 samples.

8 years agoFLV muxing is supported.
Carl Eugen Hoyos [Fri, 22 Apr 2011 17:24:17 +0000 (19:24 +0200)]
FLV muxing is supported.

8 years agoCosmetics: Rename variable daemon as run_as_daemon.
Carl Eugen Hoyos [Fri, 22 Apr 2011 16:49:44 +0000 (18:49 +0200)]
Cosmetics: Rename variable daemon as run_as_daemon.

daemon() is defined in unistd.h for BSD and Cygwin.

8 years agoSupport Canopus SD50 with fourcc "CDV5".
Carl Eugen Hoyos [Fri, 22 Apr 2011 16:45:47 +0000 (18:45 +0200)]
Support Canopus SD50 with fourcc "CDV5".

Fixes ticket #93.

8 years agorv10: set flags, Fixes Ticket90
Michael Niedermayer [Fri, 22 Apr 2011 14:00:00 +0000 (16:00 +0200)]
rv10: set flags, Fixes Ticket90
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaacdec: indentation cosmetics
Young Han Lee [Fri, 22 Apr 2011 12:39:56 +0000 (21:39 +0900)]
aacdec: indentation cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoerror: remove symbols which were deprecated before the big bump
Stefano Sabatini [Thu, 21 Apr 2011 09:48:44 +0000 (11:48 +0200)]
error: remove symbols which were deprecated before the big bump

The removal was not applied when merging the Libav patches, because
there was still code referencing the symbols.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agomatroskaenc: replace AVERROR_NOTSUPP with AVERROR(EINVAL)
Stefano Sabatini [Thu, 21 Apr 2011 09:24:34 +0000 (11:24 +0200)]
matroskaenc: replace AVERROR_NOTSUPP with AVERROR(EINVAL)

AVERROR_NOTSUPP has been dropped with the major bump. Since the
signalled error denotes a configuration problem, AVERROR(EINVAL) looks
an adequate replacement.

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

* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
libavcodec/h264.c
libavutil/error.c
libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAPIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
Ronald S. Bultje [Thu, 21 Apr 2011 23:50:19 +0000 (19:50 -0400)]
APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.

8 years agoIntroduce slice threads flag.
Ronald S. Bultje [Wed, 20 Apr 2011 18:14:42 +0000 (14:14 -0400)]
Introduce slice threads flag.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoFATE: allow forcing thread-type when doing threaded fate runs.
Ronald S. Bultje [Wed, 20 Apr 2011 17:12:38 +0000 (13:12 -0400)]
FATE: allow forcing thread-type when doing threaded fate runs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoAMV: Fix possibly exploitable crash.
Michael Niedermayer [Thu, 21 Apr 2011 20:04:21 +0000 (22:04 +0200)]
AMV: Fix possibly exploitable crash.
Reported-at: Thu, 21 Apr 2011 14:38:25 +0000
Reported-by: Dominic Chell <Dominic.Chell@ngssecure.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomjpeg: Detect overreads in mjpeg_decode_scan() and error out.
Michael Niedermayer [Thu, 21 Apr 2011 20:03:24 +0000 (22:03 +0200)]
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoUse av_log_ask_for_sample() where appropriate.
Diego Biurrun [Thu, 21 Apr 2011 17:38:49 +0000 (19:38 +0200)]
Use av_log_ask_for_sample() where appropriate.

8 years agomp: remove unused variable outlink in end_frame
Stefano Sabatini [Thu, 21 Apr 2011 16:44:47 +0000 (18:44 +0200)]
mp: remove unused variable outlink in end_frame

Fix warning:
vf_mp.c: In function ‘end_frame’:
vf_mp.c:870: warning: unused variable ‘outlink’

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agomp: remove use of deprecated old eval API
Stefano Sabatini [Thu, 21 Apr 2011 12:25:25 +0000 (14:25 +0200)]
mp: remove use of deprecated old eval API

The old API was deprecated and will be possibly removed, fix warnings
in libavfilter/libmpcodecs/vf_geq.c and libavfilter/libmpcodecs/vf_qp.c.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 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.

8 years agoerror: sort, pack, and align error code and string definitions
Stefano Sabatini [Thu, 21 Apr 2011 11:36:12 +0000 (13:36 +0200)]
error: sort, pack, and align error code and string definitions

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoThe stabilization period after version bumps should be one month, not one week.
Diego Biurrun [Thu, 21 Apr 2011 13:56:55 +0000 (15:56 +0200)]
The stabilization period after version bumps should be one month, not one week.

8 years agoapplehttp: Expose the stream bitrate via metadata
Martin Storsjö [Wed, 20 Apr 2011 07:10:10 +0000 (10:10 +0300)]
applehttp: Expose the stream bitrate via metadata

This helps callers to intelligently switch between bitrate
variants.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agodoc: Add some initial docs on the applehttp demuxer
Martin Storsjö [Wed, 20 Apr 2011 20:04:31 +0000 (23:04 +0300)]
doc: Add some initial docs on the applehttp demuxer

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoProvide a fallback version of the libm function trunc
Martin Storsjö [Thu, 21 Apr 2011 11:02:38 +0000 (13:02 +0200)]
Provide a fallback version of the libm function trunc

This fixes compilation on DOS.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibavdevice: Define _XOPEN_SOURCE for usleep
Martin Storsjö [Thu, 21 Apr 2011 10:49:21 +0000 (13:49 +0300)]
libavdevice: Define _XOPEN_SOURCE for usleep

This hopefully fixes build failures on Dragonfly BSD.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 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>
8 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>
8 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>
8 years agolavc: provide deprecated avcodec_thread_init until next major version
Anton Khirnov [Wed, 20 Apr 2011 15:21:39 +0000 (17:21 +0200)]
lavc: provide deprecated avcodec_thread_init until next major version

It was deprecated only recently.

8 years agolavc: provide the opt.h header until the next bump
Anton Khirnov [Wed, 20 Apr 2011 15:09:45 +0000 (17:09 +0200)]
lavc: provide the opt.h header until the next bump

AVOptions were moved to libavutil only recently.

8 years agoerror: change AVERROR_EOF value
Anton Khirnov [Wed, 20 Apr 2011 05:14:50 +0000 (07:14 +0200)]
error: change AVERROR_EOF value

The current value is masking the POSIX error code EPIPE, which has a
different semantics.

This breaks API.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoerror: remove AVERROR_NUMEXPECTED
Stefano Sabatini [Sun, 10 Apr 2011 22:29:30 +0000 (00:29 +0200)]
error: remove AVERROR_NUMEXPECTED

AVERROR_NUMEXPECTED is used only in the image muxer and demuxer, and
has a too much specific meaning, which is better explained through a
log message. Thus it can be replaced by AVERROR(EINVAL).

This breaks API.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoerror: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c
Stefano Sabatini [Sun, 10 Apr 2011 22:52:04 +0000 (00:52 +0200)]
error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

The new error code is better than AVERROR(ENOENT), which has a
completely different semantics ("No such file or directory").

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 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>
8 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.

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

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

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

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

8 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

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

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

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

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