OSDN Git Service
Marton Balint [Sun, 20 Feb 2011 00:18:30 +0000 (01:18 +0100)]
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
one, called real_stream_index to store the real stream index of the current
stream, no matter if we are looping through all the streams or only the streams
of a program.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 20 Feb 2011 00:18:49 +0000 (01:18 +0100)]
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 <michaelni@gmx.at>
Peter Ross [Tue, 8 Mar 2011 15:11:10 +0000 (02:11 +1100)]
Bitmap Brothers JV errata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 10 Mar 2011 12:29:22 +0000 (23:29 +1100)]
Bitmap Brothers JV demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 10 Mar 2011 12:23:25 +0000 (23:23 +1100)]
Bitmap Brothers JV video decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 Mar 2011 11:24:53 +0000 (12:24 +0100)]
Add avio_skip()
Philip Langdale [Thu, 10 Mar 2011 06:09:00 +0000 (22:09 -0800)]
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
independent of any graphics hardware in the system.
Features supported in this initial version:
* Support for Linux (using current drivers/library from git.wilsonet.com)
* Support for 70015 hardware
* Formats: MPEG2, MPEG4 Part 2, H.264, VC1 and DivX 3.11 (untested)
* Progressive content
* Non-H.264 Interlaced content
* H.264 MBAFF content
Features missing in this initial version:
* Support for OSX (might work - untested)
* Support for Windows
* Support for 70012 hardware
* H.264 PAFF content
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Mar 2011 18:56:27 +0000 (19:56 +0100)]
ffplay: Continue if the file was appended to.
This is a bit experimental
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Mar 2011 12:21:52 +0000 (13:21 +0100)]
Fix url_feof() for file appendings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Mar 2011 17:55:51 +0000 (18:55 +0100)]
Merge remote-tracking branch 'remotes/newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Mon, 7 Mar 2011 22:32:05 +0000 (22:32 +0000)]
id3v2: fix typo in error message
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
fb61a7c5343a23d845ab73dd28caf6ec98cd6101)
Anton Khirnov [Mon, 7 Mar 2011 22:32:05 +0000 (22:32 +0000)]
id3v2: fix typo in error message
Signed-off-by: Mans Rullgard <mans@mansr.com>
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: Ronald S. Bultje <rsbultje@gmail.com>
Carl Eugen Hoyos [Tue, 8 Mar 2011 19:45:26 +0000 (20:45 +0100)]
Do not use AVFMT_FLAG_NONBLOCK for the output file.
Allows to use output device alsa.
Justin Ruggles [Tue, 8 Mar 2011 18:18:57 +0000 (13:18 -0500)]
ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
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>
Stefano Sabatini [Mon, 7 Mar 2011 17:54:52 +0000 (18:54 +0100)]
framebuffer device demuxer
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>
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)
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)
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)
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)
Ronald S. Bultje [Mon, 7 Mar 2011 18:18:57 +0000 (13:18 -0500)]
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)
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)
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)
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)
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)
Justin Ruggles [Fri, 4 Mar 2011 17:12:01 +0000 (12:12 -0500)]
ac3enc: add some assertions
(cherry picked from commit
2d9a101a1f5e102d9538de827d9e4a2e8cf17c89)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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>
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.
Carl Eugen Hoyos [Mon, 7 Mar 2011 22:15:32 +0000 (23:15 +0100)]
Change filesize to int64_t.
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)
Anton Khirnov [Mon, 7 Mar 2011 20:50:25 +0000 (21:50 +0100)]
avio: deprecate url_feof
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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>
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>
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>
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>
Anssi Hannula [Mon, 14 Feb 2011 17:14:53 +0000 (19:14 +0200)]
lavf: update documentation of AVOutputFormat.flags
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Mon, 7 Mar 2011 18:18:57 +0000 (13:18 -0500)]
reindent.
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>
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>
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>
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>
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>
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>
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>
Justin Ruggles [Fri, 4 Mar 2011 17:12:01 +0000 (12:12 -0500)]
ac3enc: add some assertions
Justin Ruggles [Fri, 4 Mar 2011 17:11:03 +0000 (12:11 -0500)]
ac3enc: use av_assert2() instead of assert() to make debugging easier.
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.
Carl Eugen Hoyos [Sat, 5 Mar 2011 03:05:16 +0000 (22:05 -0500)]
Fix compilation on powerpc with --disable-altivec.
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>
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>
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>
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>
Peter Ross [Thu, 3 Mar 2011 11:37:05 +0000 (22:37 +1100)]
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.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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>
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>
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>
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>
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.
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>
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
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)
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)
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)
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)
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)
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)
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.
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
Carl Eugen Hoyos [Fri, 4 Mar 2011 19:30:40 +0000 (20:30 +0100)]
Fix compilation on powerpc with --disable-altivec.
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>
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>
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>
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.
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.
Michael Niedermayer [Fri, 4 Mar 2011 03:24:16 +0000 (04:24 +0100)]
Move guess_correct_pts() under got_picture_ptr.
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>
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)
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)
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)
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)
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)
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)
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)
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)
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)