Statistics
| Branch: | Revision:

ffmpeg @ d3f126df

# Date Author Comment
d3f126df 04/19/2011 01:18 AM Carl Eugen Hoyos

Also set the MLP/TrueHD channel layout in the decoder.

Applications might not use the parser,

280a789f 04/19/2011 01:09 AM Carl Eugen Hoyos

Make MLP/TrueHD channel layout functions visible to the decoder.

a3040715 04/19/2011 12:08 AM Michael Niedermayer

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....
39aafa5e 04/18/2011 11:54 PM Michael Niedermayer

ffmpeg:Daemon mode, add -d as first option to try it.
Signed-off-by: Michael Niedermayer <>

17ee7b55 04/18/2011 11:54 PM Michael Niedermayer

ffmpeg:Fix negative verbositiy
Signed-off-by: Michael Niedermayer <>

9c3ad1af 04/18/2011 11:17 PM Michael Niedermayer

Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.

c22f2527 04/18/2011 09:30 PM Baptiste Coudurier

In mov and flv muxer, check aac bitstream validity.

77f6b4d5 04/18/2011 06:40 PM royger

Added key_frame and pict_type to vsrc_movie

Signed-off-by: Roger Pau Monné <>
Signed-off-by: Michael Niedermayer <>

fccff6e8 04/18/2011 06:40 PM Bill Pringlemeir

Allow h264pred_init_arm.c to compile.

SOB: Bill Pringlemeir <>
Signed-off-by: Michael Niedermayer <>

62931e11 04/18/2011 06:40 PM Peter Ross

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

dc8e1b75 04/18/2011 05:25 PM Stefano Sabatini

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

f0a41afd 04/18/2011 04:23 PM Diego Biurrun

Replace mplayerhq.hu URLs by libav.org.

0b5ae1fd 04/18/2011 01:35 PM Diego Biurrun

asfdec: Remove dead code from asf_read_close().

259a3e70 04/18/2011 07:41 AM Diego Biurrun

ptx: Use av_log_ask_for_sample() where appropriate.

7e2eb4ba 04/17/2011 10:47 PM Alexander Strange

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...
2d2b5a14 04/17/2011 09:59 PM Michael Niedermayer

10l, commit that should have been stashed into the merge.
Signed-off-by: Michael Niedermayer <>

c4079844 04/17/2011 09:43 PM Michael Niedermayer

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...
fd0c3403 04/17/2011 08:46 PM Diego Biurrun

Update regtest checksums after revision 6001dad.

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

6001dad6 04/17/2011 05:31 PM Diego Biurrun

Replace more FFmpeg references by Libav.

4c64c8e9 04/17/2011 04:33 PM Justin Ruggles

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.

c9678600 04/17/2011 03:33 PM Stefano Sabatini

scale: set evaluated value for the "out_w" and "out_h" constants

The constant values were never set, thus the evaluation of expressions
referencing those constants were resulting in an error.

Signed-off-by: Stefano Sabatini <>

e93d3334 04/17/2011 03:32 PM Stefano Sabatini

scale: fix computation for the "hsub" and "vsub" constants

Signed-off-by: Stefano Sabatini <>

0b05864e 04/17/2011 06:45 AM Ronald S. Bultje

vc1: fix fate-vc1 after previous commit.

PROFILE_ADVANCED doesn't set res_fasttx, so make that a special case
in the condition that decides which IDCT to use (and whether to read
coefficients transposed or not).

Signed-off-by: Kostya Shishkov <>

14360e07 04/16/2011 11:59 PM Baptiste Coudurier

Remove now useless ffpresets for x264, use -preset

0140d3f0 04/16/2011 11:51 PM Baptiste Coudurier

In libx264 wrapper, add -preset and -tune options

abf8342a 04/16/2011 11:47 PM Baptiste Coudurier

ffmpeg: fix -aspect cli option

Redesign the way -aspect option is handled. This is done by making
ffmpeg read the sample aspect ratio set in the corresponding input
stream by default, and overriding it using the value specified by
-aspect.

If the output display aspect ratio is specified with -aspect, it is...

0ba84856 04/16/2011 11:19 PM Baptiste Coudurier

In mov muxer, compute avg bitrate in esds

1aeb88b7 04/16/2011 09:24 PM Michael Niedermayer

Correctly implement ac3 float/fixed encoder.
There is no need to have 2 encoders, the input sample format can,does and should choose which is used
Signed-off-by: Michael Niedermayer <>

bdf3d3bf 04/16/2011 07:47 PM Stefano Sabatini

ffmpeg: use parse_number_and_die() when it makes sense

Prefer parse_number_or_die() over atoi()/atol() parsing for the options:
-pass, -top, -vc, and -qscale.

Improve input validation.

Signed-off-by: Stefano Sabatini <>

584c2f1d 04/16/2011 07:47 PM Stefano Sabatini

cmdutils: add OPT_INT check in parse_number_or_die()

Check that the value passed for an OPT_INT option is an int, fail
otherwise.

58bb6b7d 04/16/2011 07:19 PM Ronald S. Bultje

wmv3dec: fix playback of complex WMV3 files using simple_idct.

IDCT coefficients are read transposed, but simple_idct does not expect
this. Therefore, only do tranposed coefficient reading if we're not
using simple_idct.

Fixes http://forum.videolan.org/viewtopic.php?f=14&t=89651

3c10843f 04/16/2011 03:51 PM Reimar Döffinger

Use av_set_pts_info to set time_base.

Also remove useless assignments of 0, the priv
context is initialized to 0.

f0a68a20 04/16/2011 03:44 PM Reimar Döffinger

Enable header parsing for MPEG2VIDEO to get time-stamps.

FFmpeg can generate pts and dts on its own, but only
if we enable parsing, so do that.
This fixes ticket #46.

bd9430db 04/16/2011 03:10 PM Philip Langdale

CrystalHD: Fix usage of h264 parser.

I was using the wrong value to track the position of the parser in the
stream. For an error-free stream, the size of the frame and number of
bytes consumed will be the same, but in an error situation they can
diverge....

09a1416d 04/16/2011 08:09 AM Roger Pau Monné

Add key_frame and pict_type to AVFilterBufferRefVideo.

d3b379b9 04/16/2011 01:55 AM Michael Niedermayer

Merge commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8'

  • commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8':
    xwma: Fix wrong printf format expression.
    xwma demuxer: typos
    oggdec: simplify audio chained ogg streams support

Merged-by: Michael Niedermayer <>

f6302ad6 04/16/2011 01:46 AM Michael Niedermayer

Merge commit 'f668afd4896ee65683619b6f165dda4cdd46766f'

  • commit 'f668afd4896ee65683619b6f165dda4cdd46766f':
    swscale: fix "ISO C90 forbids mixed declarations and code" warning
    swscale: fix compilation with --enable-runtime-cpudetect
    swscale: correct include path to fix ppc altivec build...
14622ef0 04/15/2011 08:38 PM Diego Biurrun

Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

c0eee893 04/15/2011 04:02 PM Kostya Shishkov

make av_dup_packet() more cautious on allocation failures

Signed-off-by: Luca Barbato <>

2d8591c2 04/15/2011 04:02 PM Kostya Shishkov

make containers pass palette change in AVPacket

Signed-off-by: Luca Barbato <>

4de339e2 04/15/2011 04:01 PM Kostya Shishkov

introduce side information for AVPacket

Signed-off-by: Luca Barbato <>

4d012eb5 04/15/2011 11:28 AM Diego Biurrun

xwma: Fix wrong printf format expression.

Also add inttypes.h #include for PRId64 macros.

This fixes the following warnings:
libavformat/xwma.c:147: warning: too many arguments for format
libavformat/xwma.c:151: warning: too many arguments for format

ef8b54fc 04/15/2011 10:19 AM Max Horn

xwma demuxer: typos

Signed-off-by: Diego Biurrun <>

f4bc923e 04/15/2011 09:50 AM Carl Eugen Hoyos

Allow to print wider unsupported channel layouts.

7c8c55ff 04/15/2011 09:48 AM Carl Eugen Hoyos

Warn if Vorbis does not support the provided channel layout.

The warning is printed with loglevel error because the output
stream is known to be broken.
Also warn if no channel layout was provided for multichannel input.

8f3eebd6 04/15/2011 09:45 AM Clément Bœsch

oggdec: simplify audio chained ogg streams support

Signed-off-by: Luca Barbato <>

f668afd4 04/15/2011 08:06 AM Janne Grunau

swscale: fix "ISO C90 forbids mixed declarations and code" warning

only hit with --enable-runtime-cpudetect

7f2ae5c7 04/15/2011 07:07 AM Janne Grunau

swscale: fix compilation with --enable-runtime-cpudetect

85b21147 04/15/2011 02:50 AM Michael Niedermayer

Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'

  • commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864':
    avutil: make aes and sha api public
    handle malloc failures in ff_get_wav_header
    add xWMA demuxer
    mpegts: force the default timebase
    libavcodec: Bump micro after adding the dtx AVOptions...
b6cad3df 04/14/2011 10:41 PM Janne Grunau

swscale: correct include path to fix ppc altivec build

256c5b08 04/14/2011 08:35 PM Michael Niedermayer

Fix BE/LE order of pix formats
Signed-off-by: Michael Niedermayer <>

6216fc70 04/14/2011 08:16 PM Luca Barbato

swscale: simplify rgb2rgb templating

MMX is always built. Drop the ifdefs

33a0421b 04/14/2011 08:16 PM Josh Allmann

swscale: simplify initialization code

Simplify the fallthrough case when no accelerated functions
can be initialized.

735bf195 04/14/2011 08:16 PM Josh Allmann

swscale: further cleanup swscale.c

Move x86-specific constants out of swscale.c

86330b4c 04/14/2011 08:16 PM Luca Barbato

swscale: partially move the arch specific code left

PPC and x86 code is split off from swscale_template.c. Lots of code is
still duplicated and should be removed later.

Again uniformize the init system to be more similar to the dsputil one.

Unset h*scale_fast in the x86 init in order to make the output...

c0038328 04/14/2011 08:16 PM Luca Barbato

swscale: move away x86 specific code from rgb2rgb

Keep only the plain C code in the main rgb2rgb.c and move the x86
specific optimizations to x86/rgb2rgb.c
Change the initialization pattern a little so some of it can be
factorized to behave more like dsputils.

a3a0af4f 04/14/2011 08:14 PM Alexis Ballier

avutil: make aes and sha api public

The functions are already av_ prefixed and sha1 header is already provided.
Install libavutil/{aes,sha}.h

Signed-off-by: Michael Niedermayer <>
Signed-off-by: Luca Barbato <>

ca402f32 04/14/2011 11:56 AM Max Horn

handle malloc failures in ff_get_wav_header

ff_get_wav_header is reading data from a WAVE file and then uses it
(without validation) to malloc a buffer. It then proceeded to read
data into the buffer, without verifying that the allocation succeeded.

To address this, change ff_get_wav_header to return an error if...

ad4c5034 04/14/2011 11:55 AM Max Horn

add xWMA demuxer

Signed-off-by: Luca Barbato <>

0a962e61 04/14/2011 11:51 AM Rudolf Polzer

mpegts: force the default timebase

The mpegts muxer does not set the stream time base using
av_set_pts_info, but expects it to have the default value of 1/90000.
If the calling code changes stream pts before writing the header,
other muxers override the time base at that point (like mpegenc.c).

302152d4 04/14/2011 06:34 AM Martin Storsjö

libavcodec: Bump micro after adding the dtx AVOptions

Signed-off-by: Martin Storsjö <>

b8a44442 04/14/2011 02:16 AM Carl Eugen Hoyos

AV_CH_LAYOUT_2_2 does not need channel reordering for alsa output.

6daf513c 04/14/2011 01:43 AM Carl Eugen Hoyos

Fix channel order for 7.1 TrueHD samples.

939a12e2 04/14/2011 01:33 AM Carl Eugen Hoyos

Fix channel order for some MLP samples.

19de9d56 04/14/2011 01:33 AM Carl Eugen Hoyos

Cosmetics: Fix indentation and move one line.

460acdf0 04/14/2011 01:33 AM Carl Eugen Hoyos

Support alsa channel reordering for float.

e2049edb 04/14/2011 01:33 AM Carl Eugen Hoyos

Add forgotten line to silence a warning for int32.

AV_CH_LAYOUT_QUAD is the only (multi-) channel layout that has the
same channel ordering for FFmpeg and alsa.

47c0c8ca 04/14/2011 01:33 AM Carl Eugen Hoyos

Also support alsa channel reordering for u16 and u32 formats.

1171d45f 04/14/2011 01:33 AM Carl Eugen Hoyos

Rename the s16 and s32 alsa reorder functions as int16 and int32.

The functions will also be used for unsigned formats.

0ae2a036 04/14/2011 01:33 AM Carl Eugen Hoyos

Support unsigned variants of already supported signed formats in alsa.

075a5560 04/14/2011 01:33 AM Carl Eugen Hoyos

Support a-law and mu-law output in alsa.

c55780dc 04/14/2011 01:21 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master: (32 commits)
    libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
    libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
    libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate...
651b276e 04/13/2011 09:31 PM Martin Storsjö

libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions

DTX, discontinuous transmission, allows emitting frames with
comfort noise when no voice is detected in the input audio.

Signed-off-by: Martin Storsjö <>

3dd82afc 04/13/2011 09:31 PM Martin Storsjö

libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed

Also rename the incorrectly named enc_bitrate to enc_mode, use the
enc_bitrate variable for storing the last chosen bitrate.

This avoids continuous warning log messages if not using an...

70739381 04/13/2011 09:31 PM Martin Storsjö

libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate

Dynamically print the supported bitrates from the local table,
instead of using a hardcoded log message.

Signed-off-by: Martin Storsjö <>

957635ba 04/13/2011 07:38 PM Martin Storsjö

libvo-*: Fix up the long codec names

Include VisualOn to clarify the codec name, but remove the
actual library name from the user-friendly description.
Also mention Android, to clarify which VisualOn implementation
this refers to, since they do sell other variants of the same...

567ad0e3 04/13/2011 07:14 PM Martin Storsjö

libavcodec: Mark AVCodec->priv_class const

This avoids warnings of this kind, everywhere priv_class
is initialized:

warning: initialization discards qualifiers from pointer target type

Signed-off-by: Martin Storsjö <>

0e1a5434 04/13/2011 03:24 PM Luca Barbato

swscale: Factorize FAST_BGR2YV12 definition.

It is used only for x86 so it will eventually be moved with that code
into the x86 arch subdirectory.

ff5278d8 04/13/2011 01:22 PM Carl Eugen Hoyos

Mention VisualOn in the new codecs' long names to explain "libvo".

2d326793 04/13/2011 12:43 PM Martin Storsjö

libvo-aacenc: Only produce extradata if the global header flag is set

Signed-off-by: Martin Storsjö <>

451d566f 04/13/2011 11:50 AM Anton Khirnov

lavf: postpone removal of public metadata conversion API

It's been deprecated only a few months ago, long after 0.6.

c7767327 04/13/2011 11:50 AM Anton Khirnov

lavc: postpone removal of request_channels

No decoder uses the supposed replacement, request_channel_layout, yet.

d6ead39e 04/13/2011 11:50 AM Anton Khirnov

lavc: postpone removal of audioconvert and sample_fmt wrappers

Those were moved to libavutil only recently.

548e62c5 04/13/2011 11:50 AM Anton Khirnov

lavf: postpone removal of deprecated avio functions

They've been deprecated very recently.

882221af 04/13/2011 10:00 AM Martin Storsjö

libopencore-amr: Cosmetics: Rewrap and align

Signed-off-by: Martin Storsjö <>

02c63a10 04/13/2011 10:00 AM Martin Storsjö

libopencore-amr, libvo-amrbwenc: Rename variables and functions

Avoid camelCase names for functions and variables.

Signed-off-by: Martin Storsjö <>

9b9c6405 04/13/2011 10:00 AM Martin Storsjö

libopencore-amr: Convert commented out debug logging into av_dlog

Also add the avctx as logging context.

Signed-off-by: Martin Storsjö <>

89e7e640 04/13/2011 09:59 AM Martin Storsjö

libopencore-amr: Remove an unused state variable

Signed-off-by: Martin Storsjö <>

5d211e03 04/13/2011 08:30 AM Martin Storsjö

libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table

The bitrate modes are equal to the array indices.

Signed-off-by: Martin Storsjö <>

0e03f94d 04/13/2011 08:30 AM Martin Storsjö

libopencore-amr: Remove a useless local variable

Signed-off-by: Martin Storsjö <>

c48ce4eb 04/13/2011 08:30 AM Martin Storsjö

libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const

Signed-off-by: Martin Storsjö <>

900a129f 04/13/2011 08:30 AM Martin Storsjö

libopencore-amr, libvo-amrwbenc: Return proper error codes in most places

Signed-off-by: Martin Storsjö <>

a8ec07c9 04/13/2011 08:30 AM Martin Storsjö

libopencore-amr: Don't print carriage returns in log messages

Signed-off-by: Martin Storsjö <>

58733141 04/13/2011 08:30 AM Martin Storsjö

libopencore-amr: Remove an old workaround for libamr header weirdness

Signed-off-by: Martin Storsjö <>

57ddffe8 04/13/2011 08:30 AM Martin Storsjö

libopencore-amr: Make the opaque encoder pointer a void*

Signed-off-by: Martin Storsjö <>

dbff4da9 04/13/2011 08:30 AM Martin Storsjö

libopencore-amr: Remove unused code fragments

This parts are heritage from the encoder part from the old
libamr code removed in SVN rev 19365.

Signed-off-by: Martin Storsjö <>

a92a7ddc 04/13/2011 08:30 AM Martin Storsjö

applehttp: Only check the discard flags if v->ctx actually is initialized

This code could be executed if the demuxer reads more than one
segment before returning from av_open_input_stream.

Signed-off-by: Martin Storsjö <>

f521746b 04/13/2011 08:06 AM Stefano Sabatini

ffplay: implement -showmode option

The new option allows to select the starting show mode.

f8b8c694 04/13/2011 08:06 AM Stefano Sabatini

ffplay: use symbolic constant values for show_audio

Also rename VideoState->show_audio to show_mode.
Improve readability.

8776f3d2 04/13/2011 08:06 AM Stefano Sabatini

ffplay: remove audio_write_get_buf_size() forward declaration

Move up the definition of audio_write_get_buf_size(), so that it is
defined before it is used. Simplify.