Statistics
| Branch: | Revision:

ffmpeg @ 435535e4

# Date Author Comment
435535e4 03/13/2011 05:08 AM Peter Ross

jv demuxer: prevent video packet size overflow

In the event of overflow, the JV_PADDING state will avio_skip over
any overflow bytes (using JVFrame.total_size).

47860766 03/13/2011 12:41 AM Stefano Sabatini

fbdev: fix check on nanosleep return vale

In fbdev_read_packet(): nanosleep returns -1 in case of errors,
the EINTR check has to be done on errno.

Spotted by Nicolas.

Signed-off-by: Michael Niedermayer <>

57d63d43 03/13/2011 12:36 AM Peter Ross

jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number

Signed-off-by: Michael Niedermayer <>

2f1084ca 03/13/2011 12:36 AM Peter Ross

jv demuxer: calculate palette_size for each frame in read_header

Signed-off-by: Michael Niedermayer <>

fbe98aee 03/12/2011 06:14 PM Michael Niedermayer

Revert "configure: allow checking multiple functions in check_func_headers()"

This reverts commit edaf1ae2763ce1a23dec70e730ba2bb8ee476dfd.

breaks windows builds

8876c8ae 03/12/2011 06:14 PM Michael Niedermayer

Revert "configure: improve pkg-config support"

This reverts commit 3f8040db3e13c3dbdf07c74d92ca34817a69f733.

breaks windows builds

a0a1b7b9 03/12/2011 06:14 PM Michael Niedermayer

Revert "configure: use pkg-config helpers"

This reverts commit 4fa18c5666de24316710df670e44d4850e0796a7.

breaks windows builds

27efa296 03/12/2011 04:55 PM Michael Niedermayer

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

Merged-by: Michael Niedermayer <>

0215006a 03/12/2011 02:08 PM Hendrik Leppkes

VC1: Export profile/level

Signed-off-by: Mans Rullgard <>

5dbe78bf 03/12/2011 02:08 PM Stefano Sabatini

ffmpeg: remove unused variable in ffmpeg_exit()

Fix the warning:
ffmpeg.c: In function ‘ffmpeg_exit’:
ffmpeg.c:509: warning: unused variable ‘j’

Signed-off-by: Mans Rullgard <>

1eeca886 03/12/2011 11:43 AM Jason Garrett-Glaser

VP8: optimize VP8Context struct ordering

Shaves at least 3KB off code size on x86, should improve cache utilization.
This would probably be useful to do for other decoders/encoders as well.

3efbe137 03/12/2011 11:41 AM Jason Garrett-Glaser

VP8: fix function declaration

b1d2f812 03/12/2011 11:41 AM Jason Garrett-Glaser

VP8: token probs doesn't need padding

prob0 is the only prob array ever accessed, so prob1 can serve as padding
for prob0.

628b48db 03/12/2011 11:41 AM Jason Garrett-Glaser

VP8: use a goto to break out of two loops

A break statement was supposed to break out of two loops, but only broke out of one.
Didn't affect output, just could have been marginally slower.

a5444fee 03/12/2011 11:35 AM Mans Rullgard

Add CONFIG_AC3DSP symbol to simplify makefiles

Signed-off-by: Mans Rullgard <>

4fa18c56 03/11/2011 08:13 PM Mans Rullgard

configure: use pkg-config helpers

This makes existing pkg-config uses as well as the libsdl checks
use the new pkg-config helper functions, which should be more
robust against broken systems.

Signed-off-by: Mans Rullgard <>

3f8040db 03/11/2011 08:13 PM Mans Rullgard

configure: improve pkg-config support

This adds helper functions for checking packages with pkg-config
and managing the associated flags.

Note that pkg-config use is still discouraged due to widespread
poor practices resulting in broken flags in many situations. A...

edaf1ae2 03/11/2011 08:13 PM Mans Rullgard

configure: allow checking multiple functions in check_func_headers()

This makes it possible to pass a space-separated list of functions
to check_func_headers and check_lib2. If any function is missing,
none are enabled as available, so this should only be used for...

3efbbbb5 03/11/2011 02:00 PM Michael Niedermayer

Merge remote-tracking branch 'remotes/newdev/master'

Merged-by: Michael Niedermayer <>

2800e8d6 03/11/2011 01:56 PM Michael Niedermayer

Revert "ac3enc: use MUL64 to multiply fixed-point coefficients"

Author says, this is unneeded.

This reverts commit 67fc32ac6197a7fe265795d0bf60bf704464394e.

5126a8ec 03/11/2011 12:05 PM Marton Balint

Fix av_find_best_stream when providing a wanted stream

In the main loop, stream_number is incremented after checking the stream type,
so the search usually will not find the wanted stream.

This patch eliminates the useless stream_number variable and introduces a new...

fa14610d 03/11/2011 12:03 PM Marton Balint

Fix av_find_best_stream when decoder_ret is given and using a related stream

Yet another fix for the code originally designed for use without related_stream.

Signed-off-by: Michael Niedermayer <>

9f720d5f 03/11/2011 11:25 AM Peter Ross

Bitmap Brothers JV errata

Signed-off-by: Michael Niedermayer <>

48e0d222 03/11/2011 11:25 AM Peter Ross

Bitmap Brothers JV demuxer

Signed-off-by: Michael Niedermayer <>

2f46a0af 03/11/2011 11:25 AM Peter Ross

Bitmap Brothers JV video decoder

Signed-off-by: Michael Niedermayer <>

75a8e0f0 03/11/2011 11:25 AM Michael Niedermayer

Add avio_skip()

35d7d6f7 03/11/2011 01:32 AM Benjamin Larsson

Add one more avc intra fourcc and extend the description

Signed-off-by: Ronald S. Bultje <>

aecd0a44 03/10/2011 11:05 PM Benjamin Larsson

Export profiles from the mpeg2 video decoder

Signed-off-by: Ronald S. Bultje <>

b33fa8a1 03/10/2011 07:17 PM Philip Langdale

CrystalHD decoder support v7

The Broadcom CrystalHD decoder chips provide hardware video
decoding for a number of video formats. It does so using a
memory:memory interface where a compressed bitstream is fed
in and decompressed pictures are copied out. As such, it works...

0b82612d 03/10/2011 06:57 PM Michael Niedermayer

ffplay: Continue if the file was appended to.
This is a bit experimental

Signed-off-by: Michael Niedermayer <>

3bd624b4 03/10/2011 03:26 PM Michael Niedermayer

Fix url_feof() for file appendings.
Signed-off-by: Michael Niedermayer <>

9c55fe8f 03/09/2011 06:24 PM Michael Niedermayer

Merge remote-tracking branch 'remotes/newdev/master'

Merged-by: Michael Niedermayer <>

ffb03045 03/09/2011 05:35 PM Anton Khirnov

id3v2: fix typo in error message

Signed-off-by: Mans Rullgard <>
(cherry picked from commit fb61a7c5343a23d845ab73dd28caf6ec98cd6101)

fb61a7c5 03/09/2011 10:57 AM Anton Khirnov

id3v2: fix typo in error message

Signed-off-by: Mans Rullgard <>

31ff9bd7 03/08/2011 10:45 PM Nathan Caldwell

aacenc: Fix a segfault in search_for_quantizers

This reverts the removal of scoefs from AACEncContext.
It resulted in scoefs being a NULL pointer when
search_for_quantizers() is called.

Signed-off-by: Ronald S. Bultje <>

0de8ebf4 03/08/2011 07:45 PM Carl Eugen Hoyos

Do not use AVFMT_FLAG_NONBLOCK for the output file.

Allows to use output device alsa.

cc4d3dd3 03/08/2011 06:49 PM Justin Ruggles

ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder

Signed-off-by: Michael Niedermayer <>

7e0a284b 03/08/2011 06:44 PM Justin Ruggles

ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset.

This makes channel coupling more accurate, increasing quality for stereo
content. It also simplifies exponent extraction and mantissa quantization
by no longer needing to apply an offset to the exponents....

67fc32ac 03/08/2011 06:42 PM Justin Ruggles

ac3enc: use MUL64 to multiply fixed-point coefficients

Signed-off-by: Michael Niedermayer <>

76d4c167 03/08/2011 04:34 PM Benjamin Larsson

Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file".

Signed-off-by: Michael Niedermayer <>

1a204f07 03/08/2011 04:33 PM Stefano Sabatini

framebuffer device demuxer

f56c4850 03/08/2011 11:39 AM Nathan Caldwell

aacenc: Fix a segfault in search_for_quantizers

This reverts the removal of scoefs from AACEncContext.
It resulted in scoefs being a NULL pointer when
search_for_quantizers() is called.

Signed-off-by: Michael Niedermayer <>

b543e1dc 03/08/2011 01:09 AM Anssi Hannula

mpegts: add all stream languages into metadata

This is used at least on some older DVB broadcasts for dual-mono audio
tracks.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 6a7e074eb98c4d45898d7f2920312db6899ee650)

aa612fbb 03/08/2011 01:09 AM Baptiste Coudurier

In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems
when writing and pressing q during encoding. Instead, check url_interrupt_cb
at the end.

Note that when a protocol is interrupted by url_interrupt_cb, some data may
be silently discarded: the protocol context is not suitable for anything...

a2fc93f7 03/08/2011 01:09 AM Hendrik Leppkes

Flag DVB subtitles for the hard hearing appropriately using their component_type id.

This is based on the component_type definition in the DVB SI spec [1].

[1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf

Signed-off-by: Ronald S. Bultje <>...

70b59063 03/08/2011 01:09 AM Anssi Hannula

mpegtsenc: handle multiple language tags per stream

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 435cebd01560691e9322bdb0aa5af5b2bc76c3f8)

750fbbc2 03/08/2011 01:09 AM Ronald S. Bultje

reindent.
(cherry picked from commit 4e84f994d3c17f6786fbd4f6463a168fbaaaf477)

f8bc86d4 03/08/2011 01:09 AM Anton Khirnov

avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h

also change its prefix to ffio

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit f1ef2cd9ed22be231bb4da8d2f93d9a0c7877aa7)

718975aa 03/08/2011 01:09 AM Anton Khirnov

avio: deprecate url_fget_max_packet_size

AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit e8bb2e24398ec838d9e49cf115b7e132609a9fb7)

5e06b020 03/08/2011 01:09 AM Young Han Lee

aacenc: remove the data arrays

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 2790d7a9ffbd51f33e5367a31ace5c44c30401a1)

c0fd48a7 03/08/2011 01:09 AM Anssi Hannula

lavf: document the use of multiple entries in language metadata tag

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit c92562467e8900fc727d03499afb571a9363c20c)

08d804ab 03/08/2011 01:09 AM Thadeu Lima de Souza Cascardo

aac_latm_dec: use aac context and aac m4ac

When decoding latm config, use the corresponding aac context and its
m4ac instead of using NULL and a local variable. This fixes decoding of
audio in MPEG TS from SBTVD (the Brazillian Digital TV Sytem), when
there is no extradata. This is the case when using the decoder with...

e95f3363 03/08/2011 01:09 AM Justin Ruggles

ac3enc: add some assertions
(cherry picked from commit 2d9a101a1f5e102d9538de827d9e4a2e8cf17c89)

e8a0c465 03/08/2011 01:09 AM Justin Ruggles

ac3enc: use av_assert2() instead of assert() to make debugging easier.
(cherry picked from commit 7100d63ca5edfc2e11c68201fb70d61a08a020cb)

539244ee 03/08/2011 01:09 AM Justin Ruggles

cosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec().

It only has Altivec functions and is not compiled if Altivec is disabled.
(cherry picked from commit d21be5f15bec15933cb6360aa0159961d987f449)

21527d52 03/08/2011 01:09 AM Peter Ross

Add audio codec 0x1600 (ADTS AAC)

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit d34ca1cfe3182c1cb185c31e6b1bb64f40de0e92)

db44ea96 03/08/2011 01:09 AM Anton Khirnov

avio: avio_ prefix for url_fsize

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)

1447dc59 03/08/2011 01:09 AM Anton Khirnov

avio: deprecate url_fgetc and remove all it uses

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit e51975392d85e72801193123945a35fb5221248f)

de3ef792 03/08/2011 01:09 AM Anton Khirnov

avio: deprecate url_fgets

It's not used anywhere and doesn't look ver useful to be public.

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit 655e45e7dfafc494044cc52f8889fc6da75eff6a)

e4a26958 03/08/2011 01:09 AM Sean McGovern

h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.

Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units,
this BSF is then unable to allocate an output buffer for the
modified stream. Warn that the resulting stream may be unplayable....

fb8d710f 03/08/2011 01:09 AM Martin Storsjö

Add Apple HTTP Live Streaming protocol handler

Signed-off-by: Luca Barbato <>
(cherry picked from commit f4f4e12c0d4e86c4900481b7dca94d22e733c14a)

de0bddea 03/08/2011 01:09 AM Martin Storsjö

URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME

If this flag is set, the protocol can handle URLs where the
scheme is a nested scheme such as applehttp+file: - the protocol
can handle any URL where the first segment of the nested scheme
belongs to this protocol....

0ea285dd 03/08/2011 01:09 AM Martin Storsjö

URLProtocol: Add a flags field

Signed-off-by: Luca Barbato <>
(cherry picked from commit f3bea9915fdc87c3f5b635fcfe0250a28e2b1a88)

49e617f9 03/08/2011 01:08 AM Mans Rullgard

yadif: add parens around macro parameters

This fixes compilation with preprocessors which do not add whitespace
around replaced tokens, resulting in invalid expressions like 1--1.

Signed-off-by: Mans Rullgard <>

ac533ac4 03/07/2011 10:32 PM Carl Eugen Hoyos

Do not loop endlessly if id3v2 tag size is negative / too large.

Fixes the sample from issue 2649.

2a8175ff 03/07/2011 10:32 PM Carl Eugen Hoyos

Change filesize to int64_t.

f8fab749 03/07/2011 10:32 PM Carl Eugen Hoyos

Seek back to old position after reading id3v1 tag.

FFmpeg did not seek back to the original position, but to "0", making
reading a VBR tag impossible.
(issue 2645)

66e5b1df 03/07/2011 10:20 PM Anton Khirnov

avio: deprecate url_feof

AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <>

6a7e074e 03/07/2011 08:00 PM Anssi Hannula

mpegts: add all stream languages into metadata

This is used at least on some older DVB broadcasts for dual-mono audio
tracks.

Signed-off-by: Ronald S. Bultje <>

688c22e0 03/07/2011 07:56 PM Baptiste Coudurier

In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems
when writing and pressing q during encoding. Instead, check url_interrupt_cb
at the end.

Note that when a protocol is interrupted by url_interrupt_cb, some data may
be silently discarded: the protocol context is not suitable for anything...

789936db 03/07/2011 07:44 PM Hendrik Leppkes

Flag DVB subtitles for the hard hearing appropriately using their component_type id.

This is based on the component_type definition in the DVB SI spec [1].

[1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf

Signed-off-by: Ronald S. Bultje <>

435cebd0 03/07/2011 07:43 PM Anssi Hannula

mpegtsenc: handle multiple language tags per stream

Signed-off-by: Ronald S. Bultje <>

89e568fe 03/07/2011 07:34 PM Anssi Hannula

lavf: update documentation of AVOutputFormat.flags

Signed-off-by: Ronald S. Bultje <>

4e84f994 03/07/2011 06:18 PM Ronald S. Bultje

reindent.

f1ef2cd9 03/07/2011 05:25 PM Anton Khirnov

avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h

also change its prefix to ffio

Signed-off-by: Ronald S. Bultje <>

e8bb2e24 03/07/2011 05:25 PM Anton Khirnov

avio: deprecate url_fget_max_packet_size

AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <>

2790d7a9 03/07/2011 05:25 PM Young Han Lee

aacenc: remove the data arrays

Signed-off-by: Ronald S. Bultje <>

c9256246 03/07/2011 05:25 PM Anssi Hannula

lavf: document the use of multiple entries in language metadata tag

Signed-off-by: Ronald S. Bultje <>

36864ac3 03/07/2011 05:25 PM Thadeu Lima de Souza Cascardo

aac_latm_dec: use aac context and aac m4ac

When decoding latm config, use the corresponding aac context and its
m4ac instead of using NULL and a local variable. This fixes decoding of
audio in MPEG TS from SBTVD (the Brazillian Digital TV Sytem), when
there is no extradata. This is the case when using the decoder with...

8993b596 03/07/2011 04:25 PM Michael Niedermayer

Make sure the first q press doesnt f*ck up the protocols and thus written files.
Signed-off-by: Michael Niedermayer <>

90552407 03/07/2011 04:23 PM Michael Niedermayer

Fix seting of decode_interrupt_cb()
Signed-off-by: Michael Niedermayer <>

2d9a101a 03/07/2011 04:18 PM Justin Ruggles

ac3enc: add some assertions

7100d63c 03/07/2011 04:18 PM Justin Ruggles

ac3enc: use av_assert2() instead of assert() to make debugging easier.

d21be5f1 03/07/2011 04:15 PM Justin Ruggles

cosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec().

It only has Altivec functions and is not compiled if Altivec is disabled.

159683dd 03/07/2011 04:15 PM Carl Eugen Hoyos

Fix compilation on powerpc with --disable-altivec.

d34ca1cf 03/07/2011 04:11 PM Peter Ross

Add audio codec 0x1600 (ADTS AAC)

Signed-off-by: Ronald S. Bultje <>

76aa876e 03/07/2011 04:03 PM Anton Khirnov

avio: avio_ prefix for url_fsize

Signed-off-by: Ronald S. Bultje <>

e5197539 03/07/2011 03:51 PM Anton Khirnov

avio: deprecate url_fgetc and remove all it uses

Signed-off-by: Ronald S. Bultje <>

655e45e7 03/07/2011 03:19 PM Anton Khirnov

avio: deprecate url_fgets

It's not used anywhere and doesn't look ver useful to be public.

Signed-off-by: Ronald S. Bultje <>

2af07d36 03/07/2011 03:19 PM Peter Ross

avio: add avio_skip macro

This is a substitute for the url_fskip function that was deprecated by
commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee. avio_fskip is provided to
improve demuxer code readability. It distinguishes the act of skipping over
unknown or irrelevant bytes from the standard avio_seek operation....

02dd3666 03/07/2011 03:19 PM Sean McGovern

h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.

Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units,
this BSF is then unable to allocate an output buffer for the
modified stream. Warn that the resulting stream may be unplayable....

f4f4e12c 03/06/2011 10:29 PM Martin Storsjö

Add Apple HTTP Live Streaming protocol handler

Signed-off-by: Luca Barbato <>

8f73c060 03/06/2011 10:29 PM Martin Storsjö

URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME

If this flag is set, the protocol can handle URLs where the
scheme is a nested scheme such as applehttp+file: - the protocol
can handle any URL where the first segment of the nested scheme
belongs to this protocol....

f3bea991 03/06/2011 10:29 PM Martin Storsjö

URLProtocol: Add a flags field

Signed-off-by: Luca Barbato <>

4118d66c 03/06/2011 01:16 AM Michael Niedermayer

Revert "lavf: deprecate get_strz() in favor of avio_get_str"
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.

This reverts commit 773947ba76c575abc01ba128206c87440dad40ec.

391a1327 03/05/2011 02:51 PM Mans Rullgard

yadif: add parens around macro parameters

This fixes compilation with preprocessors which do not add whitespace
around replaced tokens, resulting in invalid expressions like 1--1.

Signed-off-by: Mans Rullgard <>

b09e5068 03/05/2011 11:48 AM Reimar Döffinger

Make matroska demuxer also set timestamps for RealAudio packets.

Improves seeking in ffplay with
http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv

5e795024 03/05/2011 01:29 AM Justin Ruggles

ac3enc: add num_rematrixing_bands to AC3EncodeContext and use it instead of the hardcoded value.

Currently it is always 4, but this change will allow it to be adjusted when
bandwidth-related features are added such as channel coupling, enhanced
channel coupling, and spectral extension....

12dffc45 03/05/2011 01:29 AM Justin Ruggles

ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h
(cherry picked from commit b35743ffb46558be3a90c44f24a7de5fa2c15d85)

384c9c2f 03/05/2011 01:29 AM Anton Khirnov

avio: add avio_tell macro as a replacement for url_ftell

Signed-off-by: Ronald S. Bultje <>
(cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b)