ffmpeg.git
8 years agoac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent...
Justin Ruggles [Tue, 8 Mar 2011 18:18:56 +0000 (13:18 -0500)]
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.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoac3enc: use MUL64() to multiply fixed-point coefficients
Justin Ruggles [Tue, 8 Mar 2011 18:18:55 +0000 (13:18 -0500)]
ac3enc: use MUL64() to multiply fixed-point coefficients

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file...
Benjamin Larsson [Tue, 8 Mar 2011 14:29:46 +0000 (15:29 +0100)]
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 <michaelni@gmx.at>
8 years agoframebuffer device demuxer
Stefano Sabatini [Mon, 7 Mar 2011 17:54:52 +0000 (18:54 +0100)]
framebuffer device demuxer

8 years agoaacenc: Fix a segfault in search_for_quantizers
Nathan Caldwell [Tue, 8 Mar 2011 08:22:14 +0000 (01:22 -0700)]
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 <michaelni@gmx.at>
8 years agompegts: add all stream languages into metadata
Anssi Hannula [Thu, 17 Feb 2011 15:26:34 +0000 (17:26 +0200)]
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 <rsbultje@gmail.com>
(cherry picked from commit 6a7e074eb98c4d45898d7f2920312db6899ee650)

8 years agoIn retry_transfer_wrapper, do not check url_interrupt_cb, causes problems
Baptiste Coudurier [Fri, 4 Mar 2011 22:43:02 +0000 (23:43 +0100)]
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
anymore.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 688c22e033a48ebf84fb4b52642bbd40f11e9c4e)

8 years agoFlag DVB subtitles for the hard hearing appropriately using their component_type id.
Hendrik Leppkes [Sun, 20 Feb 2011 01:38:23 +0000 (02:38 +0100)]
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 <rsbultje@gmail.com>
(cherry picked from commit 789936dbbda60990220b80769ed75702775ea0b2)

8 years agompegtsenc: handle multiple language tags per stream
Anssi Hannula [Thu, 17 Feb 2011 15:26:35 +0000 (17:26 +0200)]
mpegtsenc: handle multiple language tags per stream

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

8 years agoreindent.
Ronald S. Bultje [Mon, 7 Mar 2011 18:18:57 +0000 (13:18 -0500)]
reindent.
(cherry picked from commit 4e84f994d3c17f6786fbd4f6463a168fbaaaf477)

8 years agoavio: move ff_rewind_with_probe_data from avio.h to avio_internal.h
Anton Khirnov [Sun, 6 Mar 2011 19:08:30 +0000 (20:08 +0100)]
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 <rsbultje@gmail.com>
(cherry picked from commit f1ef2cd9ed22be231bb4da8d2f93d9a0c7877aa7)

8 years agoavio: deprecate url_fget_max_packet_size
Anton Khirnov [Sun, 6 Mar 2011 17:04:49 +0000 (18:04 +0100)]
avio: deprecate url_fget_max_packet_size

AVIOContext.max_packet_size should be used directly instead.

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

8 years agoaacenc: remove the data arrays
Young Han Lee [Fri, 18 Feb 2011 00:33:11 +0000 (09:33 +0900)]
aacenc: remove the data arrays

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

8 years agolavf: document the use of multiple entries in language metadata tag
Anssi Hannula [Mon, 28 Feb 2011 18:30:03 +0000 (20:30 +0200)]
lavf: document the use of multiple entries in language metadata tag

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

8 years agoaac_latm_dec: use aac context and aac m4ac
Thadeu Lima de Souza Cascardo [Tue, 1 Mar 2011 12:46:12 +0000 (09:46 -0300)]
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
gst-ffmpeg and a GStreamer mpegts demuxer.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 36864ac3540445c513484017aa9927e942fac24a)

8 years agoac3enc: add some assertions
Justin Ruggles [Fri, 4 Mar 2011 17:12:01 +0000 (12:12 -0500)]
ac3enc: add some assertions
(cherry picked from commit 2d9a101a1f5e102d9538de827d9e4a2e8cf17c89)

8 years agoac3enc: use av_assert2() instead of assert() to make debugging easier.
Justin Ruggles [Fri, 4 Mar 2011 17:11:03 +0000 (12:11 -0500)]
ac3enc: use av_assert2() instead of assert() to make debugging easier.
(cherry picked from commit 7100d63ca5edfc2e11c68201fb70d61a08a020cb)

8 years agocosmetics: rename ff_fmt_convert_init_ppc() to ff_fmt_convert_init_altivec().
Justin Ruggles [Sat, 5 Mar 2011 03:51:51 +0000 (22:51 -0500)]
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)

8 years agoAdd audio codec 0x1600 (ADTS AAC)
Peter Ross [Sun, 6 Mar 2011 11:05:04 +0000 (22:05 +1100)]
Add audio codec 0x1600 (ADTS AAC)

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

8 years agoavio: avio_ prefix for url_fsize
Anton Khirnov [Fri, 4 Mar 2011 18:57:36 +0000 (19:57 +0100)]
avio: avio_ prefix for url_fsize

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

8 years agoavio: deprecate url_fgetc and remove all it uses
Anton Khirnov [Sun, 6 Mar 2011 18:59:29 +0000 (19:59 +0100)]
avio: deprecate url_fgetc and remove all it uses

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

8 years agoavio: deprecate url_fgets
Anton Khirnov [Sun, 6 Mar 2011 17:04:46 +0000 (18:04 +0100)]
avio: deprecate url_fgets

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

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

8 years agoh264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.
Sean McGovern [Fri, 4 Mar 2011 03:22:43 +0000 (22:22 -0500)]
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.

Fix roundup issue #2386.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 02dd3666c2944a3db44ba13916ba40dbdd41f9b1)

8 years agoAdd Apple HTTP Live Streaming protocol handler
Martin Storsjö [Thu, 22 Jul 2010 07:30:15 +0000 (10:30 +0300)]
Add Apple HTTP Live Streaming protocol handler

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit f4f4e12c0d4e86c4900481b7dca94d22e733c14a)

8 years agoURLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME
Martin Storsjö [Mon, 28 Feb 2011 13:39:36 +0000 (15:39 +0200)]
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.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 8f73c060773156cbf48e153506a38bcb6e2c4c6d)

8 years agoURLProtocol: Add a flags field
Martin Storsjö [Mon, 28 Feb 2011 13:39:17 +0000 (15:39 +0200)]
URLProtocol: Add a flags field

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit f3bea9915fdc87c3f5b635fcfe0250a28e2b1a88)

8 years agoyadif: add parens around macro parameters
Mans Rullgard [Thu, 24 Feb 2011 21:25:53 +0000 (21:25 +0000)]
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 <mans@mansr.com>
8 years agoDo not loop endlessly if id3v2 tag size is negative / too large.
Carl Eugen Hoyos [Mon, 7 Mar 2011 22:18:36 +0000 (23:18 +0100)]
Do not loop endlessly if id3v2 tag size is negative / too large.

Fixes the sample from issue 2649.

8 years agoChange filesize to int64_t.
Carl Eugen Hoyos [Mon, 7 Mar 2011 22:15:32 +0000 (23:15 +0100)]
Change filesize to int64_t.

8 years agoSeek back to old position after reading id3v1 tag.
Carl Eugen Hoyos [Mon, 7 Mar 2011 09:24:37 +0000 (10:24 +0100)]
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)

8 years agoMake sure the first q press doesnt f*ck up the protocols and thus written files.
Michael Niedermayer [Mon, 7 Mar 2011 16:25:38 +0000 (17:25 +0100)]
Make sure the first q press doesnt f*ck up the protocols and thus written files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix seting of decode_interrupt_cb()
Michael Niedermayer [Mon, 7 Mar 2011 16:23:32 +0000 (17:23 +0100)]
Fix seting of decode_interrupt_cb()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "lavf: deprecate get_strz() in favor of avio_get_str"
Michael Niedermayer [Sun, 6 Mar 2011 01:10:26 +0000 (02:10 +0100)]
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.

8 years agoMake matroska demuxer also set timestamps for RealAudio packets.
Reimar Döffinger [Sat, 26 Feb 2011 11:52:01 +0000 (12:52 +0100)]
Make matroska demuxer also set timestamps for RealAudio packets.

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

8 years agoac3enc: add num_rematrixing_bands to AC3EncodeContext and use it instead of the hardc...
Justin Ruggles [Fri, 4 Mar 2011 21:41:49 +0000 (16:41 -0500)]
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.
(cherry picked from commit 53e35fd340d75c40395e4446b76a72bb1962899b)

8 years agoac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h
Justin Ruggles [Fri, 4 Mar 2011 21:25:17 +0000 (16:25 -0500)]
ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h
(cherry picked from commit b35743ffb46558be3a90c44f24a7de5fa2c15d85)

8 years agoavio: add avio_tell macro as a replacement for url_ftell
Anton Khirnov [Thu, 3 Mar 2011 19:11:45 +0000 (20:11 +0100)]
avio: add avio_tell macro as a replacement for url_ftell

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

8 years agolavf: deprecate get_strz() in favor of avio_get_str
Anton Khirnov [Wed, 2 Mar 2011 16:48:45 +0000 (17:48 +0100)]
lavf: deprecate get_strz() in favor of avio_get_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e16ead0716c2f988d1e26369a4c67b354ff86134)

8 years agoavio: add avio_get_str()
Reimar Döffinger [Thu, 3 Mar 2011 12:51:55 +0000 (13:51 +0100)]
avio: add avio_get_str()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 41d8555f72e3bc60cf93af2a1a4786b452fd2736)

8 years agoavio: fix fourcc if any character is >=0x80.
Ronald S. Bultje [Fri, 4 Mar 2011 13:33:49 +0000 (08:33 -0500)]
avio: fix fourcc if any character is >=0x80.

Fixes issue 2638.
(cherry picked from commit fd085bc08203979c6d0e8a6ab031c7e19b57f7a1)

8 years agoFix compilation on powerpc with --disable-altivec.
Carl Eugen Hoyos [Fri, 4 Mar 2011 19:30:40 +0000 (20:30 +0100)]
Fix compilation on powerpc with --disable-altivec.

8 years agoIn retry_transfer_wrapper, do not check url_interrupt_cb,
Baptiste Coudurier [Fri, 4 Mar 2011 03:33:44 +0000 (19:33 -0800)]
In retry_transfer_wrapper, do not check url_interrupt_cb,
causes problems when writing and pressing q during encoding.

8 years agoMove guess_correct_pts() under got_picture_ptr.
Michael Niedermayer [Fri, 4 Mar 2011 03:24:16 +0000 (04:24 +0100)]
Move guess_correct_pts() under got_picture_ptr.

8 years agoh263dec: produce a warning when excessive bitstream is discarded
Michael Niedermayer [Thu, 3 Mar 2011 13:06:58 +0000 (14:06 +0100)]
h263dec: produce a warning when excessive bitstream is discarded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp3-mt: fix deadlock when first frame is not a keyframe.
Ronald S. Bultje [Wed, 2 Mar 2011 17:15:07 +0000 (12:15 -0500)]
vp3-mt: fix deadlock when first frame is not a keyframe.
(cherry picked from commit 8cf9a09d407c42299b3203bd1eb42af6109a0d7a)

8 years agothreads: allow thread count of zero
Mans Rullgard [Wed, 2 Mar 2011 13:08:15 +0000 (13:08 +0000)]
threads: allow thread count of zero

This moves setting the thread count to a minimum of 1 to
frame_thread_init(), allowing a value of zero to propagate
through to the codec if frame threading is not used.  This
makes auto-threads work in libx264.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ff1efc524cb3c60f2f746e3b4550bb1a86c65316)

8 years agovc1: fix decoding when end sequence is present
Baptiste Coudurier [Wed, 2 Mar 2011 11:17:33 +0000 (11:17 +0000)]
vc1: fix decoding when end sequence is present

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fb985071263e6b3daff1c3d987df482b0146c2a0)

8 years agoffmpeg: Use av_pkt_dump_log2
Martin Storsjö [Thu, 24 Feb 2011 08:08:07 +0000 (10:08 +0200)]
ffmpeg: Use av_pkt_dump_log2

This makes dumped packet timestamps proper for streams with
timebases other than AV_TIME_BASE.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 5e33e7bdac70a4b70e31f4ae6f0344060346d0b8)

8 years agolibavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter
Martin Storsjö [Thu, 24 Feb 2011 08:08:06 +0000 (10:08 +0200)]
libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter

This removes a fixme issue, by allowing the av_pkt_dump functions
to use the correct time base.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 863c471638fa667e6e5c5df059b67af263e1cd40)

8 years agoaviobuf: Write new data at s->buf_end in fill_buffer
Martin Storsjö [Sat, 26 Feb 2011 23:02:32 +0000 (01:02 +0200)]
aviobuf: Write new data at s->buf_end in fill_buffer

In most cases, s->buf_ptr will be equal to s->buf_end when
fill_buffer is called, but this may not always be the case, if
we're seeking forward by reading (permitted by the short seek
threshold).

If fill_buffer is writing to s->buf_ptr instead of s->buf_end (when
they aren't equal and s->buf_ptr is ahead of s->buffer), the data
between s->buf_ptr and s->buf_end is overwritten, leading to
inconsistent buffer content. This could return incorrect data if
later seeking back into the area before the current s->buf_ptr.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit e360ada2d13af36ab7afd9ebcd2bd236d23d9b96)

8 years agomovenc: use correct tag for dvcpro hd
Baptiste Coudurier [Tue, 1 Mar 2011 23:54:29 +0000 (23:54 +0000)]
movenc: use correct tag for dvcpro hd

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 06ed4873e6e6aed8ec7cc24285d610ef4060880e)

8 years agodnxhd: allow encoding with Avid Nitris compatibility.
Baptiste Coudurier [Tue, 1 Mar 2011 23:50:25 +0000 (23:50 +0000)]
dnxhd: allow encoding with Avid Nitris compatibility.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 99bbc781e9c134066887fc521db7a9d3607e3de1)

8 years agomovenc: fix tkhd height for imx
Baptiste Coudurier [Tue, 1 Mar 2011 23:36:48 +0000 (23:36 +0000)]
movenc: fix tkhd height for imx

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fffdee89cc0712ed3324bae1f86e271a36c02822)

8 years agoavio: deprecate url_fskip
Anton Khirnov [Mon, 28 Feb 2011 13:57:56 +0000 (14:57 +0100)]
avio: deprecate url_fskip

avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee)

8 years agolavf: replace all uses of url_fskip with avio_seek
Anton Khirnov [Mon, 28 Feb 2011 13:57:55 +0000 (14:57 +0100)]
lavf: replace all uses of url_fskip with avio_seek

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc)

8 years agoavio: avio_ prefix for url_fseek
Anton Khirnov [Mon, 28 Feb 2011 13:57:54 +0000 (14:57 +0100)]
avio: avio_ prefix for url_fseek

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)

8 years agohuffyuv: Add multithreading support
Alexander Strange [Thu, 17 Feb 2011 08:44:25 +0000 (03:44 -0500)]
huffyuv: Add multithreading support

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76d8846c4e918749b045ea2ee7399a069af5e4a5)

8 years agopthreads: Fix bug introduced with thread_safe_callbacks
Alexander Strange [Thu, 17 Feb 2011 08:25:00 +0000 (03:25 -0500)]
pthreads: Fix bug introduced with thread_safe_callbacks

For intra codecs, ff_thread_finish_setup() is called before decoding starts
automatically. However, get_buffer can only be used before it's called, so
adding this requirement broke frame threading for them. Fixed by moving the
call until after get_buffer is finished.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ad9791e12b6653a465803062e2543f25916300d3)

8 years agoFix duplicate & droped frame in Californication.S02E01.HDTV.XviD-NoTV.avi
Michael Niedermayer [Thu, 3 Mar 2011 02:37:44 +0000 (03:37 +0100)]
Fix duplicate & droped frame in Californication.S02E01.HDTV.XviD-NoTV.avi

8 years agoAttribute used is correctly supported by the Intel C compiler since version 11.1.
Carl Eugen Hoyos [Wed, 2 Mar 2011 23:25:02 +0000 (00:25 +0100)]
Attribute used is correctly supported by the Intel C compiler since version 11.1.

8 years agoUse macro __INTEL_COMPILER instead of __ICC.
Carl Eugen Hoyos [Wed, 2 Mar 2011 12:38:21 +0000 (13:38 +0100)]
Use macro __INTEL_COMPILER instead of __ICC.

__ICC is not supported on all platforms, this is an Intel documentation
bug that is supposed to be fixed in a future release.
(Intel issue 612289)

8 years agoUse --sysroot flag for clang
Mans Rullgard [Sun, 27 Feb 2011 23:34:38 +0000 (23:34 +0000)]
Use --sysroot flag for clang

Although not documented, clang does support the --sysroot flag, and it
does the right thing.  Use this flag intead of -isysroot which only
applies to header file searches, not the linker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 00ba041cb396f88f68a1bf7907e7c98ded3760ab)

8 years agoIn mov muxer, fix adpcm mono muxing, patch by Alex Converse
Baptiste Coudurier [Mon, 28 Feb 2011 00:29:21 +0000 (16:29 -0800)]
In mov muxer, fix adpcm mono muxing, patch by Alex Converse

8 years agoIn mpegts demuxer, do not output known sized packet if an unbounded packet
Baptiste Coudurier [Mon, 28 Feb 2011 00:19:50 +0000 (16:19 -0800)]
In mpegts demuxer, do not output known sized packet if an unbounded packet
is already queued. Fix issue #2624.

8 years agoARM: VP8: fix build on systems with global symbol prefix
Mans Rullgard [Sat, 26 Feb 2011 18:05:53 +0000 (18:05 +0000)]
ARM: VP8: fix build on systems with global symbol prefix

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 0b32da90f893b3e04ead18a546252e241a6a0988)

8 years agoARM: fix vp8 neon with pic enabled
Mans Rullgard [Sat, 26 Feb 2011 18:04:53 +0000 (18:04 +0000)]
ARM: fix vp8 neon with pic enabled

The assembler emits literal pools too far from the load instructions,
so we must do it explicitly at a suitable location.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 8b454c352f49c2a61db37793d838b553db3da734)

8 years agoconfigure: document FATE_SAMPLES env var in --help text
Reimar Döffinger [Sat, 26 Feb 2011 11:50:35 +0000 (11:50 +0000)]
configure: document FATE_SAMPLES env var in --help text

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 52b3cc6047e2b93e8a798734c65904243c1a7be3)

8 years agofate: get samples location from env var if not explicitly set
Mans Rullgard [Sat, 26 Feb 2011 11:51:18 +0000 (11:51 +0000)]
fate: get samples location from env var if not explicitly set

Use the FATE_SAMPLES environment variable if samples location
is not set with the --samples configure option or on the make
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa3805a486831d9c9e40cc9e897c048d60b51c1a)

8 years agomovenc: remove uses of deprecated API.
Ronald S. Bultje [Fri, 25 Feb 2011 22:41:00 +0000 (17:41 -0500)]
movenc: remove uses of deprecated API.

Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
(cherry picked from commit 13ff92d19706d17f876ff676591dace0b3e34794)

8 years agostore pasp atom for all types of quicktime movie
Maksym Veremeyenko [Tue, 15 Feb 2011 10:44:08 +0000 (12:44 +0200)]
store pasp atom for all types of quicktime movie

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit d184c86cd309bbd61c5d1a1dfcf60d133da4c1e3)

8 years agoreindent after tapt patch
Maksym Veremeyenko [Fri, 25 Feb 2011 15:42:56 +0000 (17:42 +0200)]
reindent after tapt patch

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 77d207cbe64710b7b34865f347e608b9c0e15968)

8 years agouse tapt atom for sample aspect ratio
Maksym Veremeyenko [Fri, 25 Feb 2011 15:41:55 +0000 (17:41 +0200)]
use tapt atom for sample aspect ratio

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ea1afa124cb58c7eebd4fd3706434fafb58b00c0)

8 years agobink: prevent overflows within binkidct by using int-sized intermediate array
Peter Ross [Sun, 13 Feb 2011 03:37:20 +0000 (14:37 +1100)]
bink: prevent overflows within binkidct by using int-sized intermediate array

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e211e255aa399d68239ffa42c9cc7a52eb3d55a9)

8 years agobink: decode audio track identifiers into AVStream.id
Peter Ross [Sun, 20 Feb 2011 02:15:38 +0000 (13:15 +1100)]
bink: decode audio track identifiers into AVStream.id

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 588a3ffd9687cbef60cc26d5b3a247b8ecdbf75b)

8 years agoBink version 'b' audio decoder
Peter Ross [Sun, 20 Feb 2011 01:25:05 +0000 (12:25 +1100)]
Bink version 'b' audio decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ccfcddb3f287545a20831f266c2a2f734d6a9f31)

8 years agobinkaudio: simplify frame_len_bits and frame_len calculation
Peter Ross [Sun, 20 Feb 2011 01:24:48 +0000 (12:24 +1100)]
binkaudio: simplify frame_len_bits and frame_len calculation

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8a8c283edd0da5863eb729a31a94b70820400941)

8 years agobinkaudio: remove unnecessary loop
Peter Ross [Sun, 20 Feb 2011 01:24:38 +0000 (12:24 +1100)]
binkaudio: remove unnecessary loop

decode_init sets bands[0] == 2, so this loop always sets the band table
index (k) to zero.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a304def1dca50d63bf2a39651f84792980db3508)

8 years agobinkaudio: perform band table scaling in decode_init
Peter Ross [Sun, 20 Feb 2011 01:24:25 +0000 (12:24 +1100)]
binkaudio: perform band table scaling in decode_init

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 582ac86d19c61ad73c2e1a2d5ed54a5fe1e20bd1)

8 years agobink: set audio stream codec_tag such that binkaudio decoder can identify bitstream...
Peter Ross [Sun, 20 Feb 2011 01:24:09 +0000 (12:24 +1100)]
bink: set audio stream codec_tag such that binkaudio decoder can identify bitstream version

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f0ca29eb5f476a281c8066214e3745244656d417)

8 years agobink: use LOCAL_ALIGNED for aligned stack data
Mans Rullgard [Fri, 25 Feb 2011 14:52:23 +0000 (14:52 +0000)]
bink: use LOCAL_ALIGNED for aligned stack data

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 8997bb8807336dd6d6c96364952bb71c161ac3b2)

8 years agodxva2: define required feature selection macros
Kyle [Sat, 19 Feb 2011 00:42:11 +0000 (00:42 +0000)]
dxva2: define required feature selection macros

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 04973f8082c5a822112d2e42d535b7f3f59dccc0)

8 years agoOS/2: lxlite should use stdout
Dave Yeo [Fri, 25 Feb 2011 04:19:32 +0000 (04:19 +0000)]
OS/2: lxlite should use stdout

This causes lxlite to use stdout instead of vioXXX
functions. This improves fate and build logs readability.
Affects OS/2 only.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit cc4e9d2a24a9ca79d4e912df21053426411aa14b)

8 years agoavio: deprecate put_tag
Anton Khirnov [Thu, 24 Feb 2011 06:36:05 +0000 (07:36 +0100)]
avio: deprecate put_tag

it's not used internally anymore and shouldn't be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 61840b43607679e8c4a1a63f005770f69dda12fa)

8 years agolavf: replace remaining uses of put_tag with avio_write
Anton Khirnov [Thu, 24 Feb 2011 06:36:04 +0000 (07:36 +0100)]
lavf: replace remaining uses of put_tag with avio_write

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit bbc413f943b53d96aa85fe272ec413c85794019f)

8 years agoavienc: replace &tag[0] with tag.
Anton Khirnov [Thu, 24 Feb 2011 06:36:03 +0000 (07:36 +0100)]
avienc: replace &tag[0] with tag.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 99f42c27abfe916fa19ac0c18489c8bbf8525406)

8 years agolavf: use a new ffio_wfourcc macro instead of put_tag() where possible
Anton Khirnov [Thu, 24 Feb 2011 06:36:02 +0000 (07:36 +0100)]
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0abdb2931719d96dee725e555e9b46b2b2f8a6be)

8 years agodca: use EXT_AUDIO_ID field to determine core extensions
Anssi Hannula [Fri, 18 Feb 2011 19:49:44 +0000 (19:49 +0000)]
dca: use EXT_AUDIO_ID field to determine core extensions

This avoids the core substream extensions scan when the EXT_AUDIO_ID
field indicates no extensions or only unsupported extensions. The scan
is done only if the value of EXT_AUDIO_ID is unknown or indicates a
present XCh extension which we can decode.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 7e06e0ede3b798f591634b277e8dfa6507b196de)

8 years agovmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.
Justin Ruggles [Wed, 23 Feb 2011 18:11:13 +0000 (13:11 -0500)]
vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.

There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1108f8998c6536bb44d6ecbe5adfa18e0c1478e8)

8 years agovmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding...
Justin Ruggles [Wed, 23 Feb 2011 18:11:12 +0000 (13:11 -0500)]
vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2ec7862db8b782020cc220dae827c3438d108b3a)

8 years agovmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample...
Justin Ruggles [Wed, 23 Feb 2011 18:11:11 +0000 (13:11 -0500)]
vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1e86d685e0935077766c645e49b8533d41ca11cb)

8 years agovmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making...
Justin Ruggles [Wed, 23 Feb 2011 18:11:10 +0000 (13:11 -0500)]
vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound().

This also adds output buffer size checks for AUDIO and SILENCE block types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1574eff3d23ad799d25454a449b01f94795495ea)

8 years agocosmetics: reindent after previous commit
Justin Ruggles [Wed, 23 Feb 2011 18:11:09 +0000 (13:11 -0500)]
cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ba9516cca845f8d3fb7ac08ef53a996c3ee0dbf5)

8 years agovmdaudio: move all silence chunk handling to vmdaudio_loadsound().
Justin Ruggles [Wed, 23 Feb 2011 18:11:08 +0000 (13:11 -0500)]
vmdaudio: move all silence chunk handling to vmdaudio_loadsound().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 762b386e4aafc7bbdbec367bc652cf1199e81f51)

8 years agocosmetics: remove debugging cruft
Justin Ruggles [Wed, 23 Feb 2011 18:11:01 +0000 (13:11 -0500)]
cosmetics: remove debugging cruft

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8e9027d266ef39ab9f88b4bbad5cf9e425d0696c)

8 years agocosmetics: reindent after previous commit
Justin Ruggles [Wed, 23 Feb 2011 18:11:00 +0000 (13:11 -0500)]
cosmetics: reindent after previous commit

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 868f2f4d90e07edd9a65bd9b917bb5940643ec75)

8 years agovmdaudio: simplify buffer pointer and header size handling.
Justin Ruggles [Wed, 23 Feb 2011 18:11:07 +0000 (13:11 -0500)]
vmdaudio: simplify buffer pointer and header size handling.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2d213695fce86e740800ddcf43d8d0864d2ecea5)

8 years agovmdaudio: set *data_size to zero when skipping small packets and add a warning log...
Justin Ruggles [Wed, 23 Feb 2011 18:11:06 +0000 (13:11 -0500)]
vmdaudio: set *data_size to zero when skipping small packets and add a warning log message.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7a4fb3fd9357dfdd27431a0a8d7250dab54a9938)

8 years agovmdaudio: validate block type
Justin Ruggles [Wed, 23 Feb 2011 18:11:05 +0000 (13:11 -0500)]
vmdaudio: validate block type

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22f893e1c9f9387f0a021f775757130fa48e0180)

8 years agovmdaudio: use macros and a local variable for block type.
Justin Ruggles [Wed, 23 Feb 2011 18:11:04 +0000 (13:11 -0500)]
vmdaudio: use macros and a local variable for block type.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit dd1af5136fe7767f2f18ac943efe994946864640)

8 years agovmdaudio: correct the silent chunk count in the first block.
Justin Ruggles [Wed, 23 Feb 2011 18:11:03 +0000 (13:11 -0500)]
vmdaudio: correct the silent chunk count in the first block.

This fixes A/V sync with several samples, notably:
http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6989cb2dae85ea455ffcc8a36a763134fb311e29)