Statistics
| Branch: | Revision:

ffmpeg @ master

# Date Author Comment
a4b6000b 05/17/2011 02:57 PM Michael Niedermayer

ffmpeg: reset top_field_first in opt_input_file().

This allows seting tff for inputs without also setting it for the output
Signed-off-by: Michael Niedermayer <>

bec994df 05/17/2011 10:39 AM Nicolas George

Ogg demuxer: give meaningful error codes and warnings.

Signed-off-by: Nicolas George <>

34b92dbd 05/17/2011 03:31 AM Compn

Merge branch 'master' of git.videolan.org:ffmpeg

cb8b824a 05/17/2011 03:30 AM Compn

update changelog with 9/10 bit H264 and FFV1 changes

f8ae3a21 05/17/2011 02:51 AM Michael Niedermayer

Merge remote branch 'qatar/master'

12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

  • qatar/master:
    ffmpeg: fix -aspect cli option
    Restructure video filter implementation in ffmpeg.c.
    ffplay: remove audio_write_get_buf_size() forward declaration...
e6e7ba0c 05/17/2011 01:05 AM Michael Niedermayer

Add some forgotten const to function arguments in libavfilter & libavformat.

Signed-off-by: Michael Niedermayer <>

f2962ac8 05/16/2011 11:56 PM Carl Eugen Hoyos

Write channel_layout for multichannel aif files.

6d721f71 05/16/2011 11:47 PM Carl Eugen Hoyos

Fix ff_mov_write_chan() so it can be used by other muxers.

d2549ba9 05/16/2011 11:17 PM Carl Eugen Hoyos

Fix some mov files with little endian audio (tickets 201 - 203).

e280a4da 05/16/2011 10:58 PM Stefano Sabatini

iff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly

Make the iff demuxer send the whole audio chunk to the decoder as a
single packet, move stereo interleaving from the iff demuxer to the
decoder, and introduce an 8svx_raw decoder which performs...

d8353256 05/16/2011 10:53 PM Stefano Sabatini

iff: compact code setting metadata tags

Ease readability.

34f590b2 05/16/2011 10:53 PM Stefano Sabatini

iff: fix bitrate computation for compressed audio stream

1af99b02 05/16/2011 10:53 PM Stefano Sabatini

iff: distinguish fields for audio and video compression

Create separate fields 8svx_compression (for audio compression), and
bitmap_compression (for video compression), and perform minor related
logging tweaks.

Improve clarity, also simplify the case when both types of compression...

c0170d09 05/16/2011 09:55 PM Stefano Sabatini

imgutils: introduce internal image_get_linesize() and use it

Allow to factorize code between av_image_get_linesize() and
av_image_fill_linesizes(), and add missing checks.

Increase robustness.

0d73227c 05/16/2011 09:55 PM Stefano Sabatini

imgutils: make av_image_get_linesize() return AVERROR for invalid pixel formats

d8c7a216 05/16/2011 09:50 PM Stefano Sabatini

drawtext: specify union type for setting default options

Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)

e8ea9c21 05/16/2011 09:50 PM Stefano Sabatini

drawtext: reindent after the previous commit

ce207e05 05/16/2011 09:50 PM Stefano Sabatini

drawtext: fix strftime() text expansion

The feature was dropped after the filter was partially rewritten and
recommitted.

Fix issue #207.

901ff511 05/16/2011 09:13 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...

9d5fa618 05/16/2011 09:13 PM Michael Niedermayer

Restructure video filter implementation in ffmpeg.c.

This fixes several bugs like multiple outputs and -aspect mixed with -vf

(cherry picked from commit 1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7)
(cherry picked from commit 5c20c81bfa526b3a269db9c88b0c9007861f0917)...

3a7c9774 05/16/2011 09:13 PM 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.
(cherry picked from commit 8776f3d22e401e30d17856e341f6cabbbefa92f7)

5dc65a3d 05/16/2011 09:13 PM Stefano Sabatini

lavfi: print key-frame and picture type information in ff_dlog_ref()

Signed-off-by: Stefano Sabatini <>
(cherry picked from commit f7bdffb09da597c5d6afff5359523370470ad072)

005db470 05/16/2011 08:34 PM Mans Rullgard

mathops: remove ancient confusing comment

Signed-off-by: Mans Rullgard <>

9763420b 05/16/2011 07:52 PM Michael Niedermayer

rawdec: Allow overriding top field first.

Iam not sure this is the best way to implement it, but its the simplest
and keeps the code seperate from the application. Keeping ffmpeg.c
simple and not requireing user apps to duplicate this code.
Signed-off-by: Michael Niedermayer <>

19878374 05/16/2011 07:26 PM Michael Niedermayer

ffmpeg: initialize input_codec array earlier.

Signed-off-by: Michael Niedermayer <>

5319f48a 05/16/2011 07:26 PM Michael Niedermayer

cmdutils: Allocate private decoder context if its not allocated yet.

This fixes and simplifies setting decoder private options.
Signed-off-by: Michael Niedermayer <>

c540061f 05/16/2011 06:56 PM Diego Biurrun

cws2fws: Improve error message wording.

d39facc7 05/16/2011 06:56 PM Diego Biurrun

tools: Check the return value of write().

This fixes several warnings of the type:
warning: ignoring return value of ‘write’, declared with attribute warn_unused_result

bdefbf3e 05/16/2011 04:49 PM Mans Rullgard

mpegaudio: move OUT_FMT macro to mpegaudiodec.c

Signed-off-by: Mans Rullgard <>

92ea249d 05/16/2011 04:49 PM Mans Rullgard

mpegaudio: remove OUT_MIN/MAX macros

These macros are no longer needed after the s32 output was removed.
Change the relevant code to use av_clip_int16() instead of using
explicit limits.

Signed-off-by: Mans Rullgard <>

5026f946 05/16/2011 04:10 PM Mans Rullgard

Add missing #includes to mp3_header_(de)compress bsf

Signed-off-by: Mans Rullgard <>

9503fbb8 05/16/2011 03:20 PM Mans Rullgard

dct: fix indentation

Signed-off-by: Mans Rullgard <>

721d6f2d 05/16/2011 03:20 PM Mans Rullgard

dct: bypass table allocation for DCT_II of size 32

The size-32 DCT_II has a special implementation which doesn't use
the normal tables. Skipping allocation of these in this case saves
some memory.

Signed-off-by: Mans Rullgard <>

68bed67d 05/16/2011 02:34 PM Stefano Sabatini

pngdec: relax condition for setting monoblack pixel format

Ignore color_type information for setting the monoblack pixel format,
only rely on bit_depth.

In particular: fix Test_1bpp_grayscale.png from issue #172.

This may work fine for some broken encoder, and not for others.

257de5fb 05/16/2011 01:35 PM Gil Pedersen

h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.

This fixes linking errors due to undefined symbols on x86_64 OS X.

Signed-off-by: Diego Biurrun <>

d39bf3df 05/16/2011 12:59 PM Diego Biurrun

Remove unused header mpegaudio3.h.

The header is a part of an MP3 encoder that never saw the light of day.

85eedcf6 05/16/2011 09:26 AM ami_stuff

Support decoding of 1bpp rawvideo in avi (ticket 205).

0eba7fc2 05/16/2011 09:25 AM ami_stuff

Support decoding of 2bpp rawvideo in avi (ticket 206).

d43a6edf 05/16/2011 09:24 AM Carl Eugen Hoyos

Bump minor after adding a caf muxer.

fc193793 05/16/2011 03:01 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.
    acelp: Remove unused gray_decode table.
    dfa: Remove unused variable.
    configure: Include AVX availability in summary output....
350f3d14 05/16/2011 12:57 AM Hanspeter Niederstrasser

configure: another try on fixing osx/mingw SDL

033a4a94 05/15/2011 09:42 PM Justin Ruggles

aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.

a80f74c5 05/15/2011 08:37 PM Michael Niedermayer

av_picture_crop(): Support simple cases with packed pixels too.

This fixes a regression when linked to old ffmpeg.
Signed-off-by: Michael Niedermayer <>

7f995abe 05/15/2011 05:01 PM Diego Biurrun

acelp: Remove unused gray_decode table.

b1bb3b8d 05/15/2011 11:12 AM Diego Biurrun

dfa: Remove unused variable.

This fixes the warning:
libavcodec/dfa.c:189: warning: unused variable ‘frame_end’

c73b779d 05/15/2011 11:11 AM Diego Biurrun

configure: Include AVX availability in summary output.

27614b12 05/15/2011 10:29 AM Stefano Sabatini

rawdec: propagate pict_type information to the output frame

a05d0207 05/15/2011 10:28 AM Stefano Sabatini

showinfo: replace "CRC" by "checksum"

Indeed the Adler-32 checksum, which is computed by showinfo, is not
cyclic, so using the term "CRC" is wrong/confusing.

5a2ea3cf 05/15/2011 10:27 AM Stefano Sabatini

showinfo: fix vertical align nit

bb82ea79 05/15/2011 10:27 AM Stefano Sabatini

showinfo: fix computation of Adler checksum

Previously the code was computing the checksum only for the first line
of each plane.

10931720 05/15/2011 10:27 AM Stefano Sabatini

imgutils: generalize linesize computation for bitstream formats

Make it a subcase of the general algorithm used for the non-bitstream
case. Simplify, and make av_image_get_linesize() and
av_image_fill_linesizes() correctly return the right value when plane...

c1f54478 05/15/2011 08:33 AM Reinhard Tartler

configure: use same CPPFLAGS in kFreeBSD as Linux

046f081b46c8479820409cf8f530b988221bd15b reorganized the CPPFLAGS to no
longer add -D_POSIX_C_SOURCE unconditionally, but only on systems (e.g.,
glibc based ones) that require it. As kFreeBSD uses glibc, it needs to...

5a153604 05/15/2011 02:44 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    Fix FSF address copy paste error in some license headers.
    Add an aac sample which uses LTP to fate-aac.
    DUPLICATE [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
    arm: properly mark external symbol call...
2c4ad1a3 05/15/2011 01:25 AM Carl Eugen Hoyos

Initial caf muxer.

0c3803f6 05/15/2011 01:25 AM Carl Eugen Hoyos

Support decoding of amr_nb and gsm in caf.

445ee35e 05/15/2011 01:25 AM Carl Eugen Hoyos

Fix decoding of msrle samples with 1bpp.

7b915726 05/14/2011 11:48 PM Michael Niedermayer

udp: remove resource.h inclusion, it breaks mingw compilation.

The header seems unneeded, if its needed we will put it back with appropriate #if
Signed-off-by: Michael Niedermayer <>

90bb2c78 05/14/2011 11:39 PM Michael Niedermayer

ffmpeg: Allow seting and cycling through debug modes.

Signed-off-by: Michael Niedermayer <>

888fa31e 05/14/2011 07:32 PM Diego Biurrun

Fix FSF address copy paste error in some license headers.

08e434b0 05/14/2011 04:41 PM Justin Ruggles

Add an aac sample which uses LTP to fate-aac.

34e83808 05/14/2011 01:52 PM Michael Niedermayer

ffmpeg: Help for interactive keys.

Signed-off-by: Michael Niedermayer <>

e60e54ce 05/14/2011 11:34 AM Michael Niedermayer

UDP: dont use thread_t as truth value.

Unbreak compile on mingw.
Signed-off-by: Michael Niedermayer <>

502e858f 05/14/2011 11:22 AM Peter Belkner

swscale: fix compile on mingw32

Compiling "swscale.c" breaks on MINGW32 because of multiple including
"libswscale_template.c"

76f8a96e 05/14/2011 10:37 AM Ronald S. Bultje

[PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.

Also remove code that overwrites the C versions of functions in
sws_init_swScale_altivec(), so that it uses the C functions of files
if no altivec-optimized version exists.

b1eb7a12 05/14/2011 08:38 AM Martin Aumüller

arm: properly mark external symbol call

Surround memset and ff_vp8_dct_cat_prob by X() in order to fix iOS build

Includes patch by Luca Barbato <>.

Signed-off-by: Luca Barbato <>

0f6a8579 05/14/2011 12:54 AM Michael Niedermayer

ffmpeg: Interactivity support. Try pressing +-hs.

Signed-off-by: Michael Niedermayer <>

b025431b 05/14/2011 12:50 AM Ronald S. Bultje

swscale: 10l forgot git add this change from ronald.

Signed-off-by: Michael Niedermayer <>

58c03f6d 05/14/2011 12:19 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    swscale: properly inline bits/endianness in yuv2yuvX16inC().
    (We didnt pull the bug) swscale: fix clipping of 9/10bit YUV420P.
    Add av_clip_uintp2() function
    (our patch / duplicate) dfa: fix buffer overflow checks to avoid integer overflows....
01d3ebaf 05/13/2011 10:16 PM Michael Niedermayer

AVFrame: only set parameters from AVCodecContext in decode_video*() when no frame reordering is used.

Signed-off-by: Michael Niedermayer <>

a3bc7a9e 05/13/2011 10:16 PM Michael Niedermayer

avcodec_default_get_buffer: init picture parameters.

Fixes multithreading regression introduced in 64c06615d2b99fb9f4ffd6226d0e5787b44a41e2
Fixes ticket197
Signed-off-by: Michael Niedermayer <>

9f54e461 05/13/2011 08:46 PM Ronald S. Bultje

swscale: properly inline bits/endianness in yuv2yuvX16inC().

c3d68ec9 05/13/2011 08:45 PM Ronald S. Bultje

swscale: fix clipping of 9/10bit YUV420P.

1550f45a 05/13/2011 08:45 PM Mans Rullgard

Add av_clip_uintp2() function

Signed-off-by: Mans Rullgard <>

2bd12ee3 05/13/2011 04:11 PM ami_stuff

Support more QT 1bpp rawvideo files.

Fixes ticket #189.

29ef0174 05/13/2011 03:49 PM Michael Niedermayer

UDP: udp depends on pthreads now

Signed-off-by: Michael Niedermayer <>

03f8f397 05/13/2011 03:43 PM Michael Niedermayer

udp: switch custom fifo to libavutil fifo.

This also allows us to drop the semaphore as our fifo is lock free.
Signed-off-by: Michael Niedermayer <>

593bb98d 05/13/2011 03:42 PM Michael Niedermayer

udp: use FFMAX&FFMIN.

Signed-off-by: Michael Niedermayer <>

42756021 05/13/2011 03:40 PM JULIAN GARDNER

udp: add a thread into udp.c for receiving data into a circular buffer, this stops the problem of live decoding/encoding giving errors.

Also added a buf_size which is the number of TS packets that to be allocated for the circular buffer.

4d15f194 05/13/2011 02:34 PM Stefano Sabatini

tiffenc: set bpp table for monow/monob formats

Also makes the bpp_tab non static const, as it needs to be changed in
this case.

Fix encoding of monow/monob images, fix trac issue #193.

ac8d6f12 05/13/2011 02:34 PM Stefano Sabatini

tiffenc: factorize code for monow/monob case in encode_frame() switch

Reduce code duplication, increase robustness.

995013eb 05/13/2011 02:34 PM Stefano Sabatini

tiffenc: fix bpp value for monow/monob formats

d8297ca4 05/13/2011 02:34 PM Stefano Sabatini

tiff: fix linesize for mono-white/black formats

Fix decoding of file Test_1bpp.tif, fix trac issue #171.

762b4662 05/13/2011 02:33 PM Stefano Sabatini

tiff: print log in case of unknown / unsupported tag

Helps debugging.

2c9a5172 05/13/2011 05:38 AM Reimar Döffinger

dfa: fix buffer overflow checks to avoid integer overflows.

Signed-off-by: Anton Khirnov <>

7e19a6e8 05/13/2011 05:38 AM Baptiste Coudurier

movenc: always write esds descriptor length using 4 bytes.

ipod shuffle doesn't support anything else.

Signed-off-by: Anton Khirnov <>

dbe94539 05/13/2011 05:38 AM 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 <>
Signed-off-by: Anton Khirnov <>

8fb566fd 05/13/2011 05:38 AM Anton Khirnov

ffmpeg: get rid of the 'q' key schizofrenia

SIGINT for quitting should be enough for everybody.

e3114a9c 05/13/2011 03:10 AM Michael Niedermayer

Add checksums specific to BE machines after last swscale update.

Signed-off-by: Michael Niedermayer <>

72153419 05/13/2011 02:40 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master: (33 commits)
    rtpdec_qdm2: Don't try to parse data packet if no configuration is received
    ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
    ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()...
410ca3bc 05/12/2011 11:08 PM Carl Eugen Hoyos

Support Digital Voodoo SD 8 Bit in mov (ticket 195).

92ccdfb8 05/12/2011 10:49 PM ami_stuff

Support R10g in mov.

86f2c36c 05/12/2011 10:23 PM Carl Eugen Hoyos

Add 5.1 plus stereo-downmix to mov_channel_layout array.

69b6b2d2 05/12/2011 10:23 PM Carl Eugen Hoyos

Set channel_layout for S302M.

0aac0403 05/12/2011 10:22 PM Carl Eugen Hoyos

Map mlp surround channels to FFmpeg rear channels.

This allows more 3rd party applications to correctly read
the resulting wav files.

a37f7b62 05/12/2011 10:21 PM Alexandre Colucci

Support native DTS channel order when requested.

552a9995 05/12/2011 09:20 PM Martin Storsjö

rtpdec_qdm2: Don't try to parse data packet if no configuration is received

The later parsing of payload data depends on the configuration
being present. If it hasn't been configured properly yet,
parsing a data packet may lead to a crash.

Signed-off-by: Martin Storsjö <>

f0eb373f 05/12/2011 06:07 PM Michael Niedermayer

pixfmt-Comment: Fix big/little typo

Found-by: kierank
Signed-off-by: Michael Niedermayer <>

4d7a4215 05/12/2011 04:41 PM Justin Ruggles

ac3enc: put the counting of stereo rematrixing bits in the same place to
make the code easier to understand.

257de756 05/12/2011 04:41 PM Justin Ruggles

ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()

c4fb3b03 05/12/2011 04:02 PM Michael Niedermayer

mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.

This allows the values to be used without changing C code and is closer to how
the other DEBUG flags work.

Signed-off-by: Anton Khirnov <>