OSDN Git Service
Young Han Lee [Thu, 17 Feb 2011 07:45:54 +0000 (16:45 +0900)]
mdct: remove unnecessary multiplication
3*n4 was already calculated in n3.
(cherry picked from commit
979395bbbb9381b522b44c3448c24aef9c819ffc)
Justin Ruggles [Wed, 16 Feb 2011 00:30:24 +0000 (00:30 +0000)]
ac3enc: fix bug in stereo rematrixing decision.
The rematrixing strategy reuse flags are not reset between frames, so they
need to be initialized for all blocks, not just block 0.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
5b54d4b376fbd2c291b8a6dba7d425e28f654bcf)
Anton Khirnov [Wed, 16 Feb 2011 08:52:37 +0000 (08:52 +0000)]
Replace remaining uses of parse_date with av_parse_time.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
9fcae9735e3b97366dcee9ca3c2f6cf4faf6756f)
Stefano Sabatini [Wed, 16 Feb 2011 08:52:36 +0000 (08:52 +0000)]
Deprecate parse_date() in favor of av_parse_time().
The new av_parse_time() is created in libavutil/parseutils.h, all the
internal functions used by parse_date are moved to
libavutil/parseutils.c and made static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
f6c7375a175ac649558aefab14f3895b2cb469aa)
Anton Khirnov [Wed, 16 Feb 2011 08:52:35 +0000 (08:52 +0000)]
lavf: add av_ prefix to dump_format()
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
610219a598095f938705f200dfe3946455ef871a)
Martin Storsjö [Wed, 16 Feb 2011 12:35:47 +0000 (14:35 +0200)]
rtsp: udp_read_packet returning 0 doesn't mean success
If udp_read_packet returns 0, rtsp_st isn't set and we shouldn't
treat it as a successfully received packet (which is counted and
possibly triggers a RTCP receiver report).
This fixes issue 2612.
(cherry picked from commit
2c35a6bde95a382e2d48570255deb67a7633fa46)
Nicolas George [Wed, 16 Feb 2011 13:53:08 +0000 (14:53 +0100)]
ffserver: set the sample aspect ratio
Hi.
It seems that ffserver sets sample_aspect_ratio to an invalid value and lavf
rejects it.
I am not sure what I am doing here, but the attached patch actually solves
something: using the following config:
CustomLog -
NoDaemon
RTSPPort 5454
<Stream test1-rtsp.mpg>
Format rtp
File "/tmp/test1-rtsp.mpg"
</Stream>
it allows a somewhat old ffplay (unaffected by the content-base issue I
spoke of in another thread) to play the stream.
Without it, ffserver logs this and closes the stream:
Wed Feb 16 14:52:14 2011 [rtp @ 0x1399de0]Aspect ratio mismatch between encoder and muxer layer
Regards,
--
Nicolas George
From
1b89c3c2164335060e87567b27deb0d354e0a814 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Wed, 16 Feb 2011 14:44:31 +0100
Subject: [PATCH] ffserver: set the sample aspect ratio.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
(cherry picked from commit
6741f7c9be4913e084ad067571f3f29853ec5d5a)
James Zern [Sat, 12 Feb 2011 00:02:45 +0000 (16:02 -0800)]
documentation: add encoders chapter
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
0fa904c9d845d4a47372e619067e21991bb39b06)
Stefano Sabatini [Sun, 13 Feb 2011 21:50:47 +0000 (22:50 +0100)]
In graph2dot, print more specific audio information for audio links.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
009026efb1e3b3a5f05fd9934019a6300b25f364)
Anssi Hannula [Mon, 14 Feb 2011 17:19:30 +0000 (19:19 +0200)]
spdifenc: set flag AVFMT_NOTIMESTAMPS
There are no timestamps in IEC 61937.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
6c60fcf89afc84c9dc863669d78e611d7c72fe41)
Michael Niedermayer [Fri, 18 Feb 2011 18:39:56 +0000 (19:39 +0100)]
Reduce picture size for yadif.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 Feb 2011 18:10:33 +0000 (19:10 +0100)]
Change yadif to not use out of picture lines.
Fixes issue2272.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 16 Feb 2011 19:04:04 +0000 (14:04 -0500)]
ac3dsp: Change punpckhqdq to movhlps in ac3_max_msb_abs_int16().
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
1f004fc512babe8215e2aa31fa4770aa27812cab)
Maksym Veremeyenko [Wed, 16 Feb 2011 07:52:44 +0000 (09:52 +0200)]
fix nsvdec.c compilation if DEBUG macro defined
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
41cdc1ff1e86f1bfb935e1bde53ccc9c645ff71e)
Balint Marton [Wed, 16 Feb 2011 00:17:13 +0000 (00:17 +0000)]
Fix av_find_best_stream when using a program
The current implementation has a bug, it is returning the stream index
in the found program, and not the stream index in the list of all
streams. The attached patch fixes this issue.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
22ec6b738f1608e4b959fb655cf37c3343ec7e9f)
Stefano Sabatini [Mon, 14 Feb 2011 09:59:25 +0000 (10:59 +0100)]
Document audio_resample_close().
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sat, 29 Jan 2011 12:53:14 +0000 (13:53 +0100)]
Document that av_write_header sets stream time_base to a value of it chosing.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sun, 13 Feb 2011 16:18:07 +0000 (17:18 +0100)]
spdifenc: update
482d98f69b2eb7a7b0b5054101a43db384e9432b to the latest patch
"spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI"
(cherry picked from commit
ec25f83bd98e10c023e6c7b07da1dcfc4d80cefc)
Justin Ruggles [Tue, 15 Feb 2011 18:46:56 +0000 (18:46 +0000)]
ac3enc: change default floor code to 7.
This is to match the value in every (E-)AC-3 file from commercial sources.
It has a negligible effect on audio quality.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
50d7140441b61809ad4ba4ea7b4ad8fe77bc6888)
Max Shakhmetov [Tue, 15 Feb 2011 16:49:27 +0000 (17:49 +0100)]
os_support: fix poll() implementation
Our poll implementation does not iterate over the pollfd array properly
while setting the revents.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit
9ac2085dbf1821b7995fe360038c1bf0f3940032)
Reinhard Tartler [Mon, 7 Feb 2011 13:37:08 +0000 (14:37 +0100)]
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Michael Niedermayer [Wed, 16 Feb 2011 01:09:46 +0000 (02:09 +0100)]
vbv_delay AVOption for ABI compatibility
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Tue, 15 Feb 2011 14:18:49 +0000 (14:18 +0000)]
APIchanges: update for
55bad0c: vbv_delay
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Massiot [Thu, 10 Feb 2011 15:38:03 +0000 (16:38 +0100)]
Pass VBV delay to the calling application via ctx
VBV delay is useful for T-STD compliance in some TS muxers. It is
certainly possible to retrieve it by parsing the output of FFmpeg, but
getting it from the context makes it simpler and less error-prone.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Tue, 15 Feb 2011 11:59:45 +0000 (11:59 +0000)]
binkaudio: remove unused copy of AVCodecContext*
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
71f88b1f3843fdb676d6f72181da0c8c460341d8)
Peter Ross [Tue, 15 Feb 2011 11:58:51 +0000 (11:58 +0000)]
binkaudio: fix channel count check
Perform validity check on AVFormatContext.channels instead of
uninitialised field.
This fixes issue 2001.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
9806fbd5351fa84f99fa5b18fe06859acb514f34)
Maksym Veremeyenko [Tue, 15 Feb 2011 11:51:45 +0000 (13:51 +0200)]
fix nsvdec.c compilation if DEBUG defined
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
d06497f316ed819ea0ca0fad2535342ec42c79a5)
Young Han Lee [Mon, 14 Feb 2011 09:09:43 +0000 (18:09 +0900)]
aacdec: Implement LTP support.
Ported from gsoc svn.
(cherry picked from commit
ead15f1dc196ad164d105e31c8c9025f8a4ee4e7)
Anssi Hannula [Mon, 14 Feb 2011 17:50:08 +0000 (17:50 +0000)]
APIchanges: update for
12c14cd
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
77c330a046d668373cbd9542f3e1d4746916b02f)
Mans Rullgard [Mon, 14 Feb 2011 23:14:25 +0000 (23:14 +0000)]
mpegtsenc: whitespace cosmetics
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
2dd1ee4bfe85f41b771bf8fe1c2cfa2d833b5de3)
Anssi Hannula [Mon, 14 Feb 2011 18:43:41 +0000 (18:43 +0000)]
mpegtsenc: set audio_type according to st->disposition
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3f2d3a1904c1ccdfdc3bd03a6dd6567986f681d9)
Anssi Hannula [Mon, 14 Feb 2011 18:55:04 +0000 (18:55 +0000)]
mpegts: set st->disposition according to ISO 639 language descriptor
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
60e7306643054e93dfc1962f89b24554bb76e18a)
Mans Rullgard [Mon, 14 Feb 2011 23:17:18 +0000 (23:17 +0000)]
apichanges: update for
24a83bd: add AV_DISPOSITION_CLEAN_EFFECTS flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
935ee1b9bba3d2fa1bf0d48eef278956307478cb)
Anssi Hannula [Mon, 14 Feb 2011 18:43:38 +0000 (18:43 +0000)]
lavf: add AV_DISPOSITION_CLEAN_EFFECTS flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
24a83bd10a1ed56cadd2c475b839887752f23183)
Michael Niedermayer [Tue, 15 Feb 2011 03:14:53 +0000 (04:14 +0100)]
Better threshold for the gcd based r_frame_rate calculation.
Fixes Gilmore Girls_Net 5_2011_01_08_16_10_53.wtv and RTL GP- WK Superbike - Qatar_RTL7_2009_03_14_15_49_23.wtv.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tilman Brock [Mon, 14 Feb 2011 13:29:43 +0000 (14:29 +0100)]
Fix spelling error.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
b08f59dca493e7582ddfd08097c594bfb0ae6ff9)
Ronald S. Bultje [Mon, 14 Feb 2011 14:55:14 +0000 (09:55 -0500)]
mmst: fix reading uninitialized data for ping packets.
Fixes errors after a few minutes (first ping) when playing back
mmst://wm.bbc.co.uk/wms/bbc7coyopa/bbc7_-_friday_0430.wma
(cherry picked from commit
275189a2bd71cf49d66374c44d3de2262d323460)
Mans Rullgard [Mon, 14 Feb 2011 13:02:59 +0000 (13:02 +0000)]
Update APIchanges for
910b5b8
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
08a459f096106f13c03182eed4b7cb725dc4a0ae)
Stefano Sabatini [Sat, 12 Feb 2011 17:25:53 +0000 (18:25 +0100)]
Remove disabled legacy code in ffplay.
The code was setting aspect ratio from the DTG active format, and was
present and disabled since the creation of ffplay.
See thread:
Subject: [FFmpeg-devel] [PATCH] Cosmetics: adopt compact notation in
disabled code.
Date: Sat, 12 Feb 2011 18:46:19 +0100
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
b7ec5cc4013242a9f30c429d2ce9c20ec01b03eb)
Alex Converse [Mon, 14 Feb 2011 00:42:38 +0000 (16:42 -0800)]
aac: remove dead SBR input scaling
It has been unused since
9d06d7bce3babb82ed650c13ed13a57f6f626a71
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
916dee9f45dab85cfc20b6bf63ce8722746e6508)
Mans Rullgard [Sun, 13 Feb 2011 22:10:45 +0000 (22:10 +0000)]
asfdec: fix build for big endian targets
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
aabc2682fcb70417abda0e78d27a425269a82fc8)
Justin Ruggles [Sun, 13 Feb 2011 19:49:50 +0000 (14:49 -0500)]
ac3enc: Add x86-optimized function to speed up log2_tab().
AC3DSPContext.ac3_max_msb_abs_int16() finds the maximum MSB of the absolute
value of each element in an array of int16_t.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
fbb6b49dabc3398440c6dfa838aa090a7a6ebc0d)
Peter Ross [Sun, 13 Feb 2011 03:42:49 +0000 (14:42 +1100)]
wtv: ignore empty data_guid chunks
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
1a973feb45826a1998b4286ecfe1fa7a602b8780)
Anton Khirnov [Wed, 9 Feb 2011 20:55:57 +0000 (21:55 +0100)]
asfdec: split reading stream properties out of asf_read_header()
This contains a rename from gsize->size
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
8bf6db1b29f3766732e2bb2bdd2681318fd8e215)
Francesco Cosoleto [Sat, 12 Feb 2011 10:17:20 +0000 (11:17 +0100)]
mmst: print packet type with error status code message
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
70630e35a436d890f3e3fbbe73b70042a375f326)
Mans Rullgard [Sun, 13 Feb 2011 21:00:03 +0000 (21:00 +0000)]
configure: fix non-standard regex used with expr
The colon operator of expr always anchors the pattern at the start
of the string. An explicit ^ in the pattern has unspecified
behaviour, so remove it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3ad464bfc7df6d0f68c7df9c907089b84d92ab75)
Mans Rullgard [Sun, 13 Feb 2011 13:17:46 +0000 (13:17 +0000)]
configure: report full gcc version string
This makes the cc_ident value, which is used in FATE reports, include
all interesting parts of the gcc version string.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
5d57846bba7010dc6ee65c3503dd06600e5441a5)
Mans Rullgard [Sun, 13 Feb 2011 13:06:53 +0000 (13:06 +0000)]
configure: add cleanws() function
This function removes leading and trailing spaces and collapses
multiple spaces into one.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
bb7a22b5840e56c034227ad596b1165c03f2da27)
Loren Merritt [Sat, 12 Feb 2011 11:48:16 +0000 (11:48 +0000)]
FFT: factor a shuffle out of the inner loop and merge it into fft_permute.
6% faster SSE FFT on Conroe, 2.5% on Penryn.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
e6b1ed693ae4098e6b9eabf938fc31ec0b09b120)
Anssi Hannula [Sat, 12 Feb 2011 18:11:11 +0000 (20:11 +0200)]
lavf: print stream disposition in dump_stream_format
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
3c33c0e26325f189dbf7f212f8e9042feb83bfb0)
Anssi Hannula [Sat, 12 Feb 2011 13:57:01 +0000 (15:57 +0200)]
spdifenc: fix byte order on big-endian systems
There is a check for HAVE_BIGENDIAN when outputting the IEC 61937
stream. On big-endian systems the payload data is not byteswapped,
causing in effect the outputted payload data to be in a different byte
order on big-endian than on little-endian systems.
However, the IEC 61937 preamble (and the final odd byte if present) is
always outputted in the same byte order. This means that on big-endian
systems the headers have a different byte order than the payload,
preventing useful use of the output.
Fix that by outputting the data in a format suitable for sending to an
audio device in S16LE format by default. Output as big-endian (S16BE)
is added as an AVOption. This makes the muxer output the same on all
archs by default.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
57f2c9aed9fecbb1e6798ec33613141afe74fd31)
Anssi Hannula [Sat, 29 Jan 2011 01:36:30 +0000 (03:36 +0200)]
spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
482d98f69b2eb7a7b0b5054101a43db384e9432b)
Peter Ross [Sun, 13 Feb 2011 09:36:29 +0000 (09:36 +0000)]
bink: permute Bink version 'b' quant matrices by inverse scan order
This fixes visual glitches in Bink version 'b' files, as the quantization
tables were not being permuted.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
231539217431c32d4f22a16ee2834e24f54611f4)
Peter Ross [Sun, 13 Feb 2011 03:33:49 +0000 (03:33 +0000)]
bink: simplify how quantization matrices are passed to read_dct_coeffs()
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
cb62510cab8b745e65eb966c72ab7e9b122d564b)
Mans Rullgard [Sun, 13 Feb 2011 00:19:06 +0000 (00:19 +0000)]
Fix MMX rgb24 to yuv conversion with gcc 4.6
When built with gcc 4.6, the MMX rgb24 to yuv conversion gives
wrong output. The compiler produces this warning:
libswscale/swscale_template.c:1885:5: warning: use of memory input without lvalue in asm operand 4 is deprecated
Changing the memory operand to a register makes it work.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
f344903ca5ce28a833fdd656bc1ed5b16d97e7e9)
Takashi Mochizuki [Sun, 13 Feb 2011 00:18:45 +0000 (09:18 +0900)]
movenc: Force first sample as SYNC
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
44b11207248c6ca6edb7d3469c0fbdca45dbfa70)
Stefano Sabatini [Sun, 13 Feb 2011 21:59:55 +0000 (22:59 +0100)]
Make avfilter_config_links() propagate audio information of the source link if it is not explicitely set by the filter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Feb 2011 22:02:10 +0000 (23:02 +0100)]
Restructure video filter implemenattion in ffmpeg.c.
This fixes several bugs like multiple outputs and -aspect mixed with -vf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Feb 2011 13:44:17 +0000 (14:44 +0100)]
Make truncated mpeg4 GOP header check a bit more specific.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 14 Feb 2011 09:59:14 +0000 (10:59 +0100)]
Apply minor cosmetics fixes to the av_audio_resample_init() doxy.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 14 Feb 2011 09:59:25 +0000 (10:59 +0100)]
Document audio_resample_close().
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Feb 2011 16:20:46 +0000 (17:20 +0100)]
Detect null gop headers.
Fix issue2592. / mpeg4-bad-gvop.raw
Vitor Sessak [Sat, 12 Feb 2011 09:15:58 +0000 (10:15 +0100)]
Make tables generation insensitive to floating-point implementation
Using doubles make the double -> int cast well defined for all the values
used, with the exception of when s[i]==1.0, which is special-cased.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
47d62c965b7bcf4715127fbf9bffab7b4c5c88b7)
Stefano Sabatini [Sat, 12 Feb 2011 09:12:41 +0000 (09:12 +0000)]
Fix script command in a FAQ entry
In the FAQ section "How do I encode single pictures into movies?", use
-s for generating symbolic links with the ln command.
The script was generating hard links, which is not likely what it was
supposed to do.
Fix issue 2488.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
e063f5886b27a7374f5060b7c2c21385685b2cb0)
Stefano Sabatini [Sat, 12 Feb 2011 08:50:46 +0000 (08:50 +0000)]
Allow "make clean" to clean files in tools
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
40321376d8aea3347bec9c4d09925e8c5b8edb55)
Stefano Sabatini [Sat, 12 Feb 2011 08:50:35 +0000 (08:50 +0000)]
Add lavfi-showfiltfmts and graph2dot to $(TOOLS)
Allow make clean to remove the corresponding binaries.
Fix issue 2162.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
cd6a5a57b820c5fe008ea0f91a727861b7b2a331)
Baptiste Coudurier [Fri, 11 Feb 2011 23:20:10 +0000 (23:20 +0000)]
Fix qtrle regression test, actually test qtrle.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
646739a0a8368bd234ff077c093bbf01e9e7f44a)
Martin Storsjö [Fri, 11 Feb 2011 21:36:47 +0000 (23:36 +0200)]
rtsp/rdt: Assign the RTSPStream index to AVStream->id
This is used for mapping AVStreams back to their corresponding
RTSPStream. Since
d9c0510, the RTSPStream pointer isn't stored in
AVStream->priv_data any longer, breaking this mapping from AVStreams
to RTSPStreams.
Also, we don't need to clear the priv_data in rdt cleanup any longer,
since it isn't set to duplicate pointers.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
b2dd842d21a0b441bb9f7092357f479beb6b6f69)
Justin Ruggles [Fri, 11 Feb 2011 20:17:32 +0000 (15:17 -0500)]
Add check for Athlon64 and similar AMD processors with slow SSE2.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
74b1f96859eb967222fcb3eb4c72d949b5165a89)
Mans Rullgard [Fri, 11 Feb 2011 18:28:12 +0000 (18:28 +0000)]
configure: remove early check_deps $ARCH_EXT_LIST
The early disabling of irrelevant arch extensions is no longer
required, and removing it makes dependencies involving these
work as expected.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
4b884207eb7319577f8ceb94a56f42c5ac0ab294)
Mans Rullgard [Tue, 1 Feb 2011 22:38:15 +0000 (22:38 +0000)]
VP8: ARM optimised decode_block_coeffs_internal
Approximately 5% faster on Cortex-A8.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
a7878c9f73c12cfa685bd8af8f3afcca85f56a8b)
Mans Rullgard [Wed, 22 Dec 2010 12:57:53 +0000 (12:57 +0000)]
ARM optimised vp56_rac_get_prob()
Approximately 3% faster on Cortex-A8.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
7da48fd0111adf504cfcfc5ebda7fd0681968041)
Stefano Sabatini [Fri, 11 Feb 2011 13:39:31 +0000 (13:39 +0000)]
Update overlay documentation after movie syntax update.
Overlay documentation is still using the old unsupported syntax.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
aa8ac53b51cd8b9446b50404660685041060fa4f)
Peter Ross [Wed, 9 Feb 2011 12:05:19 +0000 (23:05 +1100)]
bink: reindent after last commit
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
adb1ad0d8005dfcbae863bccdda8fdd26bb63f30)
Peter Ross [Fri, 11 Feb 2011 12:31:32 +0000 (23:31 +1100)]
Bink version 'b' video decoder
Based on original patch by Kostya Shishkov
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
e00f41d5742b3a0dc1877b030f4f6f58c19b7bbd)
Anton Khirnov [Thu, 10 Feb 2011 08:36:44 +0000 (09:36 +0100)]
lavf: deprecate AVFormatContext.index_built
it's not touched anywhere in ffmpeg, the code setting it was removed
over two years ago (
e9b78eeba22b050810a507e69df1b652e56ab62b).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
b0294c80d3a3981ec7ef9e4654962780e8566075)
Michael Niedermayer [Fri, 11 Feb 2011 13:56:03 +0000 (14:56 +0100)]
Clarify that pts_correction* fields are internal to libavcodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 12 Feb 2011 14:29:10 +0000 (15:29 +0100)]
Set maximum lowres value for the MJPEG decoder to 3.
While 4 works for some samples, 3 is the correct value since 8x8
DCT is used by (m)jpeg.
Nicolas George [Tue, 8 Feb 2011 10:57:08 +0000 (11:57 +0100)]
ffplay: stats: do not dereference NULL video
Also: cosmetic: split this overly long line
Jason Garrett-Glaser [Thu, 10 Feb 2011 06:43:25 +0000 (22:43 -0800)]
VP8: optimized mv prediction and decoding
Merge find_near_mvs and mv bitstream decoding: don't do prediction steps
until absolutely necessary.
(cherry picked from commit
f3d09d44b70492022964e2ead5f439bb7c96eaa2)
Justin Ruggles [Thu, 10 Feb 2011 22:12:16 +0000 (22:12 +0000)]
ac3enc: Remove unneeded clipping of shift amount.
s->windowed_samples will always have a range of [-32767,32767] due to the
window function, so the return value from log2_tab() will always be in the
range [0,14].
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
626264b11b5406c0c78c4056cabb63cb650e9bf2)
Justin Ruggles [Thu, 10 Feb 2011 21:15:01 +0000 (21:15 +0000)]
ac3enc: remove right shifting from lshift_tab() and make lshift unsigned.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
d4582889eefeee4dd23face9e74b2829dbaaeae5)
Anton Khirnov [Wed, 9 Feb 2011 20:55:56 +0000 (21:55 +0100)]
asfdec: deobfuscate reading video properties size
This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
0b1d291a716dd79ca6862a95baf9ac574feba885)
Anton Khirnov [Wed, 9 Feb 2011 20:55:55 +0000 (21:55 +0100)]
asfdec: split asf_read_header()
Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
c1fea2307011ac7a7bb98af98010f81abc789732)
Peter Ross [Thu, 10 Feb 2011 06:26:10 +0000 (17:26 +1100)]
wtv: mark streams intended for hearing or visual impaired persons
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
68137ba386933243a84fc65f0deb3ad0ce5ff0ea)
Peter Ross [Thu, 10 Feb 2011 06:25:40 +0000 (17:25 +1100)]
make av_find_best_stream() ignore streams marked with AV_DISPOSITION_*_IMPAIRED
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
52091491575f015c09a32a745de4f7f7592fe6d4)
Peter Ross [Thu, 10 Feb 2011 06:25:13 +0000 (17:25 +1100)]
add AV_DISPOSITION_HEARING_IMPAIRED and AV_DISPOSITION_VISUAL_IMPAIRED
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
12c14cd4a8bf844f6f3d16ae18999bdb47999324)
Mans Rullgard [Thu, 10 Feb 2011 12:04:25 +0000 (12:04 +0000)]
Remove final semicolon from some macros
This avoids double semicolons after macro expansion.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
44adbebe1744c68d66d7f811c38270fdcc89665a)
Ronen Mizrahi [Thu, 10 Feb 2011 16:50:00 +0000 (11:50 -0500)]
dvbsubenc: Fix placement of the object version
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
df211c3ab73b36208ac4511a9cd7feb817f551fa)
Janne Grunau [Thu, 10 Feb 2011 08:57:18 +0000 (09:57 +0100)]
document passing the fate samples location via make variable
(cherry picked from commit
5c19f64c600ece050a1deb27f53963e4416beb31)
Janne Grunau [Wed, 9 Feb 2011 22:23:22 +0000 (23:23 +0100)]
dvbsubdec: check against buffer overreads
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
493aa30adf88baf5bc734072592a22db586f0cfb)
Reimar Döffinger [Wed, 9 Feb 2011 18:32:07 +0000 (19:32 +0100)]
Do not fail DVB sub decoding because of a few padding bytes
Instead of returning an error when bytes are left over, just return
the number of actually used bytes as other decoders do.
Instead add a special case so an error will be returned when none
of the data looks valid to avoid making debugging a pain.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
4a72765a1c94b05bd3053b1f34f8457a3b71d714)
Justin Ruggles [Thu, 10 Feb 2011 17:20:36 +0000 (12:20 -0500)]
Add x86-optimized versions of exponent_min().
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
dda3f0ef48aa5c3b03566b60b6bf63211e1fe579)
Mans Rullgard [Thu, 10 Feb 2011 12:21:19 +0000 (12:21 +0000)]
Remove incorrect return statement from avcodec_thread_free()
The function return type is void, so a return statement with an
expression is forbidden (and pointless).
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
b4668274b944abae61759e796c5cc36ade510f24)
Mans Rullgard [Thu, 10 Feb 2011 12:04:52 +0000 (12:04 +0000)]
ivi_dsp: remove semicolons after function definitions
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
dbb09ec23f16cb5e4ec3d4e0911dae0beb95869b)
Mans Rullgard [Thu, 10 Feb 2011 11:42:21 +0000 (11:42 +0000)]
mov: remove stray semicolon
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
628b16f45f79aa5eb7514f11026d85e8aa34387f)
Anton Khirnov [Wed, 9 Feb 2011 20:55:52 +0000 (21:55 +0100)]
asfdec: skip the stream bitrate list
Its contents aren't used for anything.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
d7a5106eb2dad33765b0e5f11fd8b1a87e5a9b4b)
Anton Khirnov [Wed, 9 Feb 2011 20:55:54 +0000 (21:55 +0100)]
asfdec: use an ASFContext array for storing stream bitrates
This will be useful for splitting asf_read_header()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
7c7253802bbb4f7330ff9b32358bf05f9880cbdf)
Anton Khirnov [Wed, 9 Feb 2011 20:55:53 +0000 (21:55 +0100)]
asfdec: move DAR list to ASFContext
This will be useful for splitting asf_read_header()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
d42b09723ed154d5269b95efcc20cb1874f60816)
David Fries [Mon, 7 Feb 2011 21:14:43 +0000 (23:14 +0200)]
udp: Enable address reuse by default for multicast
Keep the original corner case behaviour, where reuse is enabled
for the case where no argument is given to the reuse url option.
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
00952be424ba7403d71c338933354d2172df8e67)