OSDN Git Service
Ronald S. Bultje [Mon, 21 Feb 2011 14:07:13 +0000 (09:07 -0500)]
VC1: merge idct8x8, coeff adjustments and put_pixels.
Merging these functions allows merging some loops, which makes the
results (particularly after SIMD optimizations) much faster.
(cherry picked from commit
f8bed30d8b176fa030f6737765338bb4a2bcabc9)
Anton Khirnov [Sun, 20 Feb 2011 14:03:29 +0000 (15:03 +0100)]
avio: rename av_alloc_put_byte -> avio_alloc_context for consistency
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
8d9ac969cb4ac3e3e18f6425703af4d7aec6c513)
Ronald S. Bultje [Sun, 20 Feb 2011 22:31:33 +0000 (17:31 -0500)]
dsputil: make {add/put/put_signed}_pixels_clamped() non-static.
(cherry picked from commit
484a337cd7cd8bb180c4a1bd3321881f1c874a92)
Ronald S. Bultje [Sun, 20 Feb 2011 15:46:55 +0000 (10:46 -0500)]
VC1: inline vc1_put_block() in vc1_decode_i_blocks().
Advantage is that it allows us to combine several loops into a single
one, and these can eventually be merged into the IDCT itself. Also, it
allows us to remove vc1_put_block(), and makes CODEC_FLAG_GRAY faster.
(cherry picked from commit
bbfd2e7ab4e2ae0b934657fe51afdbbbaead52b7)
Mans Rullgard [Sun, 20 Feb 2011 17:16:42 +0000 (17:16 +0000)]
Makefile: include deps from tools directory
This ensures the tools are rebuilt when necessary. Specifically,
lavfi-showfiltfmts was sometimes not rebuilt causing spurious test
failures.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
08df7f866663f83ba42398cea9f3eeff4681ea9a)
Mans Rullgard [Sun, 20 Feb 2011 16:47:19 +0000 (16:47 +0000)]
amrnb: use correct size when copying lsf_r array
lsf_r is an array of int16_t, not float.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
1efa772e20be5869817b2370a557bb14e7ce2fff)
Mans Rullgard [Sun, 20 Feb 2011 14:38:32 +0000 (14:38 +0000)]
x86: use raw opcode for xgetbv instruction
This allows the CPU detection to work with assemblers not supporting
the xgetbv mnemonic. These include clang and some BSD versions.
All AVX code will be written for yasm, where the main assembler
is not involved.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
ef6695387522fc783105ac187c84beaa284e7cff)
Michael Niedermayer [Tue, 22 Feb 2011 00:41:52 +0000 (01:41 +0100)]
Add shadow support to the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 22 Feb 2011 00:11:35 +0000 (01:11 +0100)]
factor draw_glyphs out of drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Feb 2011 23:54:48 +0000 (00:54 +0100)]
Fix and optimize yuv blend in the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Feb 2011 23:43:19 +0000 (00:43 +0100)]
get rid of divisions in the inner loop of the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Feb 2011 23:28:54 +0000 (00:28 +0100)]
fix chroma alpha in the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 21 Feb 2011 23:23:31 +0000 (00:23 +0100)]
Simplify chroma blend in the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 21 Feb 2011 00:02:29 +0000 (01:02 +0100)]
Port drawtext filter by Hemanth from the libavfilter soc repo, with
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Brandon Mintern [Mon, 21 Feb 2011 11:02:57 +0000 (12:02 +0100)]
lavfi: add fade filter
Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 20 Feb 2011 22:42:24 +0000 (23:42 +0100)]
lavfi: put color source in a dedicated file
Move the color source code from vf_pad.c to vsrc_color.c.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 20 Feb 2011 22:42:17 +0000 (23:42 +0100)]
lavfi: add drawutils
Add drawutils.h and drawutils.c, and use them in the pad filter.
The new functions are going to be shared by other filters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 20 Feb 2011 13:46:22 +0000 (08:46 -0500)]
Update version and APIchanges.
Update libavformat/version.h and doc/APIChanges after renaming
init_put_byte() and ByteIOContext to ffio_init_context() (private)
and AVIOContext, (public), and deprecating the originals.
(cherry picked from commit
d2bbf82e65e4a128ab1f0bf48df5d1e43c43c698)
Anton Khirnov [Sun, 20 Feb 2011 10:04:13 +0000 (11:04 +0100)]
avio: move init_put_byte() to a new private header and rename it
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
e731b8d8729e75bfb69f5540e6446d6118dac549)
Anton Khirnov [Sun, 20 Feb 2011 10:04:12 +0000 (11:04 +0100)]
avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
Ronald S. Bultje [Sun, 20 Feb 2011 00:07:29 +0000 (19:07 -0500)]
VC1: don't use vc1_put_block() in vc1_decode_i_blocks_adv().
Advanced profile never uses "range reduction", so vc1_put_block() quite
literally just calls put_pixels_clamped() from vc1_decode_i_blocks_adv().
By inlining the function, we can prevent calling IDCT8x8 if
CODEC_FLAG_GRAY is set, and we don't have to scale the coeffs in the
[0,256] range, but can instead use put_signed_pixels_clamped().
(cherry picked from commit
70aa916e4630bcec14439a2d703074b6d4c890a8)
Mans Rullgard [Wed, 16 Feb 2011 02:39:42 +0000 (02:39 +0000)]
x86: check for AVX support
This adds configure and runtime checks for AVX support on x86 CPUs.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
87f1355f9b4fc11414d0e6a91404203c2745f89f)
Marton Balint [Sat, 19 Feb 2011 16:33:15 +0000 (17:33 +0100)]
MMS: also discover streams in extended stream properties object
Allows playback of nonprimary audio streams in multiple bitrate sources,
such as mmsh://wmscr1.dr.dk/e02ch03m
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit
74d6871d6244865b5863a01c3dab16a2f06a1706)
Ronald S. Bultje [Sat, 19 Feb 2011 13:50:37 +0000 (08:50 -0500)]
dsputil_mmx.c: remove ff_vector128.
Remove ff_vector128, it is identical to ff_pb_80.
(cherry picked from commit
bf6fa732459399fac215bdfa44dd39a6fb1d1e01)
Reimar Döffinger [Sat, 19 Feb 2011 10:33:01 +0000 (11:33 +0100)]
Fix invalid reads in VC1 decoder
Patch discussed and taken from https://roundup.ffmpeg.org/issue2584
(cherry picked from commit
2bbec1eda46d907605772a8b6e8263caa4bc4c82)
David Conrad [Sat, 19 Feb 2011 09:41:51 +0000 (01:41 -0800)]
Fix VP3 edge emulation
With negative stride, the start of the edge_emu buffer should be pointing to
the last line, not the end of the buffer.
With positive stride, pointing to the end of the buffer was completely wrong.
(cherry picked from commit
a89f4ca005efa5ee82089583c7b8bc00bcee816a)
Young Han Lee [Sat, 19 Feb 2011 00:32:24 +0000 (09:32 +0900)]
aacdec: dsputilize the scalar multiplication in intensity stereo
(cherry picked from commit
9707f84fa73c23352937fc7e4e0a85eaf3135cbc)
Jason Garrett-Glaser [Fri, 18 Feb 2011 04:24:05 +0000 (20:24 -0800)]
VP3: fix decoding of videos with stride > 2048
Also remove qscale_table code; this didn't make sense anyways as VP3 doesn't
use an MPEG-like quantizer scale.
(cherry picked from commit
902685b8abf4e2089802528a32a50f3c68033fda)
Michael Niedermayer [Sat, 19 Feb 2011 16:30:04 +0000 (17:30 +0100)]
Fix issue2619.
regression introduced in
1762d9ced70ccc46c5d3e5d64e56a48d0fbbd4f7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean-Daniel Dupas [Fri, 18 Feb 2011 09:35:51 +0000 (10:35 +0100)]
targa: fix potential buffer overreads
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
351423ae1f861da1c647d30c73503fde2b1f3dad)
Ronald S. Bultje [Fri, 18 Feb 2011 00:33:33 +0000 (19:33 -0500)]
Fix PPC build.
(cherry picked from commit
ed040f35f298b39f1ddd45a133c82cb5d6d79dda)
Jason Garrett-Glaser [Thu, 17 Feb 2011 21:56:26 +0000 (13:56 -0800)]
VP8: init one less near_mv
This one didn't actually need to be initialized.
(cherry picked from commit
891b1f15a7e45a2a5f91cb4c27d11259ef8e012f)
Jason Garrett-Glaser [Wed, 16 Feb 2011 18:20:54 +0000 (10:20 -0800)]
Force inlining of avutil common routines
On some versions of gcc, these weren't always getting inlined due to hitting
the inline cap limit in some files. This is generally bad, as most of these
functions are smaller inlined than not.
(cherry picked from commit
eb3755a5aa65da685d81399cfae4bd35e4a178b6)
Jason Garrett-Glaser [Wed, 16 Feb 2011 17:49:50 +0000 (09:49 -0800)]
VP8: split out declarations to new header
(cherry picked from commit
bcf4568f183055331415ba230e82af6d59faac1c)
Jason Garrett-Glaser [Wed, 16 Feb 2011 17:39:00 +0000 (09:39 -0800)]
VP8: faster MV clipping
(cherry picked from commit
7634771e70575b2a5abaeb420c5b3c2f9948c693)
Ronald S. Bultje [Thu, 17 Feb 2011 19:45:03 +0000 (14:45 -0500)]
dsputil: move VC1-specific stuff into VC1DSPContext.
(cherry picked from commit
12802ec0601c3bd7b9c7a2503518e28fd5e7d744)
Ronald S. Bultje [Thu, 17 Feb 2011 17:14:12 +0000 (12:14 -0500)]
VC1: simplify a calculation in a loop.
(cherry picked from commit
0b16cdc3fa1d73056649abf43288be0a7624fdcc)
Ronald S. Bultje [Wed, 16 Feb 2011 19:18:21 +0000 (14:18 -0500)]
VC1: transpose IDCT 8x8 coeffs while reading.
(cherry picked from commit
1da6ea39542424ddb691dc6cf08d611a4c6db247)
Martin Storsjö [Wed, 16 Feb 2011 14:37:40 +0000 (16:37 +0200)]
ffserver: Try matching the RTSP url without a trailing slash
If the client sends PLAY/PAUSE requests with the same url as
specified in Content-Base, these requests may have urls with
trailing slashes.
(cherry picked from commit
c2ca851b234e169b50730ef357aeade8047491eb)
Janne Grunau [Thu, 17 Feb 2011 20:49:08 +0000 (21:49 +0100)]
Add SHA1s to APIChanges for av_dump_format, av_parse_time and av_find_info_tag
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
c3dbfa1afd7d989e3bba4c6bfc492a52c012e9b3)
Anton Khirnov [Wed, 16 Feb 2011 08:52:39 +0000 (09:52 +0100)]
lavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixes
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
09d171b98879f58be1a766d5f277e131b18e98a1)
Anton Khirnov [Wed, 16 Feb 2011 08:52:38 +0000 (09:52 +0100)]
Move find_info_tag to lavu and add av_ prefix to it
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
ab0287fcbdebc8ff416214535d7ee8424406990e)
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>