ffmpeg.git
8 years agowmadec: prevent null pointer call.
Michael Niedermayer [Mon, 25 Apr 2011 14:16:44 +0000 (16:16 +0200)]
wmadec: prevent null pointer call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofraps: do not set avctx->pix_fmt to none in decode_init()
Stefano Sabatini [Mon, 25 Apr 2011 20:08:15 +0000 (22:08 +0200)]
fraps: do not set avctx->pix_fmt to none in decode_init()

This is required for setting up the filterchain, as it requires the
pixel format to be set, which is usually done when probing the file
with av_find_stream_info().

Fix trac issue #83.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agolsws: prevent overflow in sws_init_context()
Stefano Sabatini [Sun, 24 Apr 2011 23:17:08 +0000 (01:17 +0200)]
lsws: prevent overflow in sws_init_context()

In the loop:
    for (i=0; i<dstH; i++) {
        int chrI= i*c->chrDstH / dstH;

when i*c->chrDstH > INT_MAX this leads to an integer overflow, which
results in a negative value for chrI and in out-of-buffer reads. The
overflow is avoided by forcing int64_t arithmetic by casting i to
int64_t.

Fix crash, and trac issue #72.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffplay: fix logic for selecting the show mode in case of missing video
Stefano Sabatini [Sun, 24 Apr 2011 22:49:18 +0000 (00:49 +0200)]
ffplay: fix logic for selecting the show mode in case of missing video

Also automatically select the show mode only if not specified by the
user.

Fix trac issue #109.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffplay: name ShowMode enum
Stefano Sabatini [Sun, 24 Apr 2011 22:31:59 +0000 (00:31 +0200)]
ffplay: name ShowMode enum

Help debugging with GDB, maybe cleaner/safer.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoPatch from Packman (OpenSuse - packages) to silence rpmlint.
Manfred Tremmel [Mon, 25 Apr 2011 17:53:47 +0000 (19:53 +0200)]
Patch from Packman (OpenSuse - packages) to silence rpmlint.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSet start_time to 0 for raw audio files.
Reimar Döffinger [Sun, 24 Apr 2011 22:47:40 +0000 (00:47 +0200)]
Set start_time to 0 for raw audio files.

None of the raw audio files have timestamps, thus setting
start_time to 0 should be reasonable.

8 years agoRemove now unused audio_float configure option.
Reimar Döffinger [Mon, 25 Apr 2011 10:29:04 +0000 (12:29 +0200)]
Remove now unused audio_float configure option.

8 years agodca: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:27:12 +0000 (12:27 +0200)]
dca: allow selecting float output at runtime.

8 years agovorbisdec: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:22:26 +0000 (12:22 +0200)]
vorbisdec: allow selecting float output at runtime.

8 years agoaacdec: Allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:16:40 +0000 (12:16 +0200)]
aacdec: Allow selecting float output at runtime.

8 years agoac3dec: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 09:59:28 +0000 (11:59 +0200)]
ac3dec: allow selecting float output at runtime.

8 years agoDo not set non_interleaved for DV-in-AVI.
Reimar Döffinger [Mon, 25 Apr 2011 11:54:26 +0000 (13:54 +0200)]
Do not set non_interleaved for DV-in-AVI.

It does not make sense (DV is interleaved by design) and
it avoids a crash when the non-interleaved code tries to
use the priv_data of streams created by the DV demuxer.
The crash could be avoided differently, but then that stream
would still lack an index and would not play correctly in
non-interleaved mode.
Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi

8 years agoWarn if the source has unsupported (or no) channel layout.
Carl Eugen Hoyos [Mon, 25 Apr 2011 09:23:06 +0000 (11:23 +0200)]
Warn if the source has unsupported (or no) channel layout.

8 years agoSet channel layout for 4 and 5.1 channel cdata audio files
Peter Ross [Mon, 25 Apr 2011 01:52:15 +0000 (11:52 +1000)]
Set channel layout for 4 and 5.1 channel cdata audio files

Patch from Carl Eugen Hoyos (cehoyos at ag dot or dot at)

Signed-off-by: Peter Ross <pross@xvid.org>
8 years agoMerge remote branch 'qatar/master'
Michael Niedermayer [Mon, 25 Apr 2011 00:29:09 +0000 (02:29 +0200)]
Merge remote branch 'qatar/master'

* qatar/master:
  vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
  applehttp: Don't export variant_bitrate if it isn't known
  crypto: Use av_freep instead of av_free
  configure: Add missing libm library dependencies to .pc files.
  oggdec: reindent after 8f3eebd6
  configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCheck mmap() return against correct value
unknown author [Sun, 24 Apr 2011 23:48:46 +0000 (01:48 +0200)]
Check mmap() return against correct value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbisdec: Employ proper printf format specifiers for uint_fast32_t.
Diego Biurrun [Sun, 24 Apr 2011 17:49:39 +0000 (19:49 +0200)]
vorbisdec: Employ proper printf format specifiers for uint_fast32_t.

libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘uint_fast32_t’
libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘uint_fast32_t’

8 years agoSupport fourcc MMJP.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:43:13 +0000 (00:43 +0200)]
Support fourcc MMJP.

Fixes ticket #107.

8 years agoSupport fourcc XVIX.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:35:59 +0000 (00:35 +0200)]
Support fourcc XVIX.

Fixes ticket #106.

8 years agoSupport fourcc M263.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:27:03 +0000 (00:27 +0200)]
Support fourcc M263.

Fixes ticket #103.

8 years agoSupport fourcc auv2.
ami_stuff [Sun, 24 Apr 2011 22:20:27 +0000 (00:20 +0200)]
Support fourcc auv2.

Fixes ticket #101.

8 years agoFix indentation.
Reimar Döffinger [Sun, 24 Apr 2011 22:02:36 +0000 (00:02 +0200)]
Fix indentation.

8 years agoSupport PARSER_FLAG_COMPLETE_FRAMES for h261 and h263 parsers.
Reimar Döffinger [Sun, 24 Apr 2011 17:17:17 +0000 (19:17 +0200)]
Support PARSER_FLAG_COMPLETE_FRAMES for h261 and h263 parsers.

8 years agoffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay
Stefano Sabatini [Fri, 22 Apr 2011 15:11:23 +0000 (17:11 +0200)]
ffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay

In video_image_display(), fix exception occurring when the size of the
rectangle passed to SDL_DisplayYUVOverlay() is 0x0, which happens when
interactively resizing the SDL window.
This is done by forcing the minimum size to 1x1.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoavi: try to synchronize the points in time of the starts of streams after seeking.
Michael Niedermayer [Sun, 24 Apr 2011 20:38:05 +0000 (22:38 +0200)]
avi: try to synchronize the points in time of the starts of streams after seeking.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd flag to force demuxers to sort more strictly by dts.
Michael Niedermayer [Sun, 24 Apr 2011 19:29:35 +0000 (21:29 +0200)]
Add flag to force demuxers to sort more strictly by dts.
This enables non interleaved AVI mode for example.
Players that are picky on strict interleaving can set this.
Patches to only switch to non intereaved AVI mode when the index is not strictly
correctly interleaved are welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoapplehttp: Don't export variant_bitrate if it isn't known
Martin Storsjö [Sun, 24 Apr 2011 17:19:49 +0000 (20:19 +0300)]
applehttp: Don't export variant_bitrate if it isn't known

If there are no variants, the total bitrate of the single
stream isn't known, and exporting variant_bitrate = 0 does
look weird, since there really aren't any variants.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agocrypto: Use av_freep instead of av_free
Martin Storsjö [Sun, 24 Apr 2011 17:10:37 +0000 (20:10 +0300)]
crypto: Use av_freep instead of av_free

Using av_freep is generally good practice.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoCrystalHD: Add AVOption to configure hardware downscaling.
Philip Langdale [Thu, 21 Apr 2011 04:41:43 +0000 (21:41 -0700)]
CrystalHD: Add AVOption to configure hardware downscaling.

The CrystalHD hardware can do scaling, which is particularly
desirable when dealing with some high resolution clips that take
so long to decode and copy out that they end up playing back
slower than realtime. By using scaling, we can make the output
frames smaller and reduce the copy out time.

This option takes the desired horizontal width in pixels, and
the hardware will do an aspect-scale. Upscaling is not supported
and the hardware will simply ignore any request to do so.

Signed-off-by: Philip Langdale <philipl@overt.org>
8 years agoCheck for malloc failures in fraps decoder.
Reimar Döffinger [Sun, 24 Apr 2011 12:49:29 +0000 (14:49 +0200)]
Check for malloc failures in fraps decoder.

8 years agoUse av_fast_malloc instead of av_realloc in fraps decoder.
Reimar Döffinger [Sun, 24 Apr 2011 12:39:07 +0000 (14:39 +0200)]
Use av_fast_malloc instead of av_realloc in fraps decoder.

8 years agogeneral.texi: document libcelt decoder.
Nicolas George [Sat, 23 Apr 2011 09:42:26 +0000 (11:42 +0200)]
general.texi: document libcelt decoder.

8 years agoFix some passing argument from incompatible pointer type warnings.
Michael Niedermayer [Sun, 24 Apr 2011 15:46:50 +0000 (17:46 +0200)]
Fix some passing argument from incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: Add missing libm library dependencies to .pc files.
Reinhard Tartler [Sun, 24 Apr 2011 15:24:24 +0000 (17:24 +0200)]
configure: Add missing libm library dependencies to .pc files.

This unbreaks static compilation using pkg-config on systems in need of -lm.
Based on an mplayer2 patch by Uoti Urpala <uau@mplayer2.org>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agooggdec: reindent after 8f3eebd6
Clément Bœsch [Sun, 24 Apr 2011 13:40:57 +0000 (15:40 +0200)]
oggdec: reindent after 8f3eebd6

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoconfigure: Add missing libavutil inter-library dependencies to .pc files.
Reinhard Tartler [Sun, 24 Apr 2011 09:39:15 +0000 (11:39 +0200)]
configure: Add missing libavutil inter-library dependencies to .pc files.

This unbreaks static compilation when using pkg-config.
Based on an mplayer2 patch by Uoti Urpala <uau@mplayer2.org>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoDrop section describung now unneeded workarounds for BSD
Michael Niedermayer [Sun, 24 Apr 2011 11:27:07 +0000 (13:27 +0200)]
Drop section describung now unneeded workarounds for BSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>