]>
git.sesse.net Git - ffmpeg/log
Justin Ruggles [Thu, 27 Jan 2011 14:21:26 +0000 (14:21 +0000)]
cosmetics: indentation and spacing
(cherry picked from commit
b5ec6383432c907bed175f20e39af1a99dc75cfb )
Justin Ruggles [Thu, 27 Jan 2011 15:20:43 +0000 (15:20 +0000)]
Remove the add bias hack for the C version of DSPContext.float_to_int16_*().
(cherry picked from commit
9d06d7bce3babb82ed650c13ed13a57f6f626a71 )
John Stebbins [Wed, 26 Jan 2011 05:15:49 +0000 (05:15 +0000)]
mov: add support for little-endian utf16 chapter names
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
97b04f5ed3ab3a62e57f0c16841fb8f10d0a174c )
Janne Grunau [Thu, 27 Jan 2011 16:26:20 +0000 (17:26 +0100)]
movenc: byteswap codec_tag in mov_write_ms_tag
based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
(cherry picked from commit
795ed278e6d702ad841c3043e2b878afc6f599f4 )
Justin Ruggles [Thu, 27 Jan 2011 23:58:27 +0000 (23:58 +0000)]
Add special case for 2nd-order IIR filter.
40% faster in ff_iir_filter_flt() when c->order == 2.
(cherry picked from commit
37cb3eb53449ccefbbe8ea7dc5e66f9036aafe6e )
Luca Barbato [Thu, 27 Jan 2011 02:56:14 +0000 (03:56 +0100)]
Add ff_ to AVHWAccel decoders
That unbreaks compilation of vaapi and dxva2
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
d1b6f33bf2ce56f013a1c5a013a19671c0f30ea0 )
Diego Elio Pettenò [Tue, 25 Jan 2011 22:03:28 +0000 (22:03 +0000)]
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit
c6610a216ed2948885772154a2eed696e0cb4aca )
Anton Khirnov [Sun, 23 Jan 2011 11:35:23 +0000 (12:35 +0100)]
mov: simplify mov_read_chapters() by using avio_get_str16be
It probably also fixes a memleak or two.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
225b6d7fdea370de3723420e6adc2f3192439b00 )
Mans Rullgard [Wed, 26 Jan 2011 21:54:42 +0000 (21:54 +0000)]
Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"
This reverts commit
c34461b35b68ff1f3d04540e0279383c51be8cee .
The wrong version of the patch was committed.
(cherry picked from commit
c4f8765ac55562fc6ab705e3d17275b69eb5f71d )
Ronald S. Bultje [Wed, 26 Jan 2011 20:34:36 +0000 (15:34 -0500)]
VP8: don't overread edges on fourtap MC.
Fix C VP8 H+V MC functions which do two-dimensional 4/6-tap filters to
not overread beyond their edges if the second filter is 4-tap, since
the outer pixels aren't there anymore since
44002d8323023c35f51d523a7d305e45103ba7a1 .
(cherry picked from commit
22893e10ae8b72880838accc3df97785502ac6aa )
Diego Elio Pettenò [Tue, 25 Jan 2011 21:40:11 +0000 (21:40 +0000)]
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
d36beb3f6902b1217beda576aa18abf7eb72b03c )
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:44 +0000 (00:29 +0000)]
Make ff_cmap_read_palette static to libavcodec/iff.c. Delete iff.h.
The iff.h header only declared one function that is now static, the
libavformat/iff.c source file wasn't using it before. Drop the file
entirely.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
2d162e3825a35b6ac42a27d27c4a3ebbd141828d )
Justin Ruggles [Tue, 25 Jan 2011 20:07:07 +0000 (20:07 +0000)]
Add ff_ prefix to ac3_common_init().
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
4c57cde942b3d28074d0bb06e2ca200bc1098f22 )
Justin Ruggles [Tue, 25 Jan 2011 20:07:06 +0000 (20:07 +0000)]
ac3: Remove ff_ac3_critical_band_size_tab.
It is only used to generate band_start_tab, which about the same size, at
runtime, so it's simpler just to always hardcode band_start_tab.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
24e3ad3031fa26e12d4b939f0ff0dd6e12f05ef5 )
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:34 +0000 (00:29 +0000)]
Make the avfilter debug functions and macros static to avfilter.c
This removes ff_get_ref_perms_string, ff_dprintf_ref and ff_dprintf_link
fro the interface of libavfilter.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
eb7ccf8f3369f9e15029ce65370a114206b39fd5 )
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:43 +0000 (00:29 +0000)]
Mark C base versions of FFT functions static to fft.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
7767d8d361ca104d74c8390b72db21aa4d7fc322 )
Marco Gittler [Wed, 26 Jan 2011 02:07:34 +0000 (18:07 -0800)]
Pass field order flag to libx264
Signed-off-by: Jason Garrett-Glaser <jason@x264.com>
(cherry picked from commit
b09f5482854f9b4a139b1401d196b26db11dd10f )
Georgi Chorbadzhiyski [Tue, 25 Jan 2011 11:20:03 +0000 (11:20 +0000)]
mpegtsenc: set reserved bits to 1 in PCR field
The reserved bits between PCR base and extension fields must be
set to 1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
535638b55f83ad47e4680883e87b97e69d0847e5 )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:35 +0000 (02:59 +0100)]
Make ff_add_wav static to ra144.c
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
1a8867486215abe3b705f7d189723d528cea2b70 )
Diego Elio Pettenò [Tue, 25 Jan 2011 00:29:38 +0000 (00:29 +0000)]
Make ff_rtsp_send_cmd_with_content_async static to rtsp.c.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
57c4d01ec9286b3b9f9a0101654f7bc8a00edb63 )
Diego Elio Pettenò [Tue, 25 Jan 2011 00:59:30 +0000 (00:59 +0000)]
Make ff_h264_find_frame_end static to h264.c; delete h264_parser.h
The header is empty after making the function static, so delete it and
drop its usage.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
13eb6b90977768116c937c5d6b2e074679a3ad21 )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:29 +0000 (02:59 +0100)]
Make ff_sin_tabs constant to rdft.c
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
d625a32d6ba0405e6da061991dfd90f6da2a3b7a )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:28 +0000 (02:59 +0100)]
Make ff_spatial_idwt_{init, slice} static to dwt.c
Both functions seem to be commanded by the ff_spatial_idwt function
instead.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
ebb06d96ed3f6e1c16f2d40e55c151b5b5522918 )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:41 +0000 (02:29 +0100)]
Make ff_png_pass_xmin and ff_png_pass_xshift static to png.c.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
f2e246f576cd53e75b3696e1db418be98fbda76f )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:40 +0000 (02:29 +0100)]
Remove unused ff_ac3_parse_header_full function.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
676f1f533e2c2960d81784188592a066b9ff1c3d )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:37 +0000 (02:29 +0100)]
Make ff_mxf_pixel_layouts static to mxf.c.
Also make it an anonymous structure as never it is accessed by name.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
a3dffc0627dfd85f8b1a72b9b637938dfa197208 )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:42 +0000 (02:29 +0100)]
Make ff_h264_decode_rbsp_trailing static to h264.c
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
8529731961d79fc0e747b16152df3d470b530537 )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:36 +0000 (02:29 +0100)]
Make ff_interleave_compare_dts static to utils.c.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
101e1f6ff90c3365bfde05469ae26d2ee7f71f3e )
Anton Khirnov [Sun, 23 Jan 2011 11:38:30 +0000 (12:38 +0100)]
mov: simplify mov_read_chapters() by using avio_get_str16be
It probably also fixes a memleak or two.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
c34461b35b68ff1f3d04540e0279383c51be8cee )
Anton Khirnov [Sun, 23 Jan 2011 11:38:29 +0000 (12:38 +0100)]
asfdec: remove some commented-out cruft
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
2934cd9dbf390962ec008182f9eddd4296cf5527 )
Anton Khirnov [Sun, 23 Jan 2011 11:38:27 +0000 (12:38 +0100)]
lavf: make a variant of ff_get_str16_nolen public
It will be useful in mp3 demuxer and hopeful some other places.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
93b78d12106112d7c5d9cfdcf96fc3dce9dc5f82 )
Mans Rullgard [Tue, 25 Jan 2011 14:45:20 +0000 (14:45 +0000)]
armcc: filter out non-gcc options from ASFLAGS
This allows passing armcc-specific flags with --extra-cflags without
choking the assembler.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
d0f0f6287c7fd29474e58fe1b86db2885f20c457 )
Mans Rullgard [Tue, 25 Jan 2011 14:44:07 +0000 (14:44 +0000)]
configure: add filter_out() function
This adds a function to filter out words matching a pattern
from a list.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
9d201b260627aacdb00e4a54622849aca11d85ee )
Ronald S. Bultje [Tue, 25 Jan 2011 17:25:07 +0000 (12:25 -0500)]
Don't do edge emulation unless the edge pixels will be used in MC.
Do not emulate larger edges than we will actually use for this round of
MC. Decoding goes from avg+SE 29.972+/-0.023sec to 29.856+/-0.023, i.e.
0.12sec or ~0.4% faster.
(cherry picked from commit
44002d8323023c35f51d523a7d305e45103ba7a1 )
Jai Menon [Tue, 25 Jan 2011 04:55:43 +0000 (22:55 -0600)]
ffmetaenc: Use correct format specifiers.
Use printf format macros from inttypes.h.
Additionally, this fixes a warning when building with clang.
(cherry picked from commit
c0ae5152d19790e8719c8d1d2bf9b761491dbda6 )
Mans Rullgard [Tue, 25 Jan 2011 03:33:43 +0000 (03:33 +0000)]
intfloat_readwrite: include "mathematics.h" for fallback macros
This allows this file to build on systems lacking NAN or INFINITY
in math.h.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
e781c4e6ff0b93db1ebc0ebe6983b38490117a98 )
Mans Rullgard [Tue, 25 Jan 2011 03:31:45 +0000 (03:31 +0000)]
tty: remove superflous #include <strings.h>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
1e48cdaac32e42a5c87a8f203b5827bdcc46db93 )
Mans Rullgard [Tue, 25 Jan 2011 15:48:46 +0000 (15:48 +0000)]
ac3: remove ff_ac3_critical_band_size_tab[] external declaration
This fixes compilation broken by
6ed3b504f984dc6cefde8d57a57726f9d30e5033
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
21c900129c268587fa2df774242bfd8af72ff890 )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:59:36 +0000 (01:59 +0000)]
Move ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables.
This symbol is only ever used to calculate the non-hardcoded tables, so
only enable it in that case, and static to the source unit that uses it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
6ed3b504f984dc6cefde8d57a57726f9d30e5033 )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:14 +0000 (23:36 +0000)]
Remove unused ac3_parametric_bit_allocation function.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
362bfe29971b3bb8497d2b341337697be15a257c )
Mans Rullgard [Tue, 25 Jan 2011 13:25:18 +0000 (13:25 +0000)]
Makefile: fix cleaning of tools in tests directory
The variable TESTPROGS is reset by the library makefiles,
use another name.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3d157bf31f33cf413a6fb04ba69a4015ca0625cb )
Daniel Verkamp [Tue, 25 Jan 2011 09:28:01 +0000 (09:28 +0000)]
configure: move network tests before results are needed
This moves network_extralibs setup before use so that the link tests
for network functions work correctly.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
54fe299b885109556c72538977f9eefb969a0d87 )
Georgi Chorbadzhiyski [Tue, 25 Jan 2011 10:58:31 +0000 (12:58 +0200)]
mpegtsenc: remove unused variables
Remove two variables that were not used and caused the following
warnings:
CC libavformat/mpegtsenc.o
libavformat/mpegtsenc.c: In function 'mpegts_write_section':
libavformat/mpegtsenc.c:72:18: warning: unused variable 'ts'
libavformat/mpegtsenc.c: In function 'mpegts_insert_null_packet':
libavformat/mpegtsenc.c:586:18: warning: unused variable 'ts'
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
6e78c8ee9420cc8e8899462b59e2305b4c056081 )
Daniel Verkamp [Tue, 25 Jan 2011 07:58:18 +0000 (07:58 +0000)]
Fix ALLPROGS_G so that *_g binaries get cleaned properly
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3adbe49f2b1a25d2fd44080167b6519c4ce4e30e )
Mans Rullgard [Tue, 25 Jan 2011 03:31:01 +0000 (03:31 +0000)]
latm: remove superflous #includes
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
e153e9a53a6fbfba974b8263bca70f7bba02952c )
Mans Rullgard [Tue, 25 Jan 2011 02:24:43 +0000 (02:24 +0000)]
avidec: make print_tag() a macro and remove related ifdefs
The dprintf macro is a no-op if DEBUG is not defined, so there
is no need to guard it here.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
6081f8c4e283bf1b33e4cf4b2ca44217219f9210 )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:18 +0000 (23:36 +0000)]
Make RTPFirstDynamicPayloadHandler static to rtpdec.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
119cc033fc88f4a7d6cc4ef6ee02097476e8f2a9 )
Diego Elio Pettenò [Tue, 25 Jan 2011 01:29:35 +0000 (01:29 +0000)]
Make ff_realmedia_mp3_dynamic_handler static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
69ad22c7a7c2d961b413f96b437de267261311e2 )
Mans Rullgard [Tue, 25 Jan 2011 01:02:19 +0000 (01:02 +0000)]
Make denoise_dct_c() and dct_quantize_trellis_c() static in definitions
1d4da6a460d5b78026e3b854fdd6f469957a054c added static to the
prototypes for these fuctions. Adding it to the definitions
as well.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
aa61e39eac85e26bff0f296b1ec86d4533664adc )
Diego Elio Pettenò [Tue, 25 Jan 2011 00:41:24 +0000 (00:41 +0000)]
Don't declare a pcm_dvd encoder.
The PCM_DVD encoder would be left unused, as allcodecs.c properly declared
it as being decoder-only, but it would still be built into the object file.
Since there is no block of code to properly encode this PCM format, it's
not a full codec.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
5b5083b5fed1e0b0d8f3c6f2c21bdc915b1226f6 )
Diego Elio 'Flameeyes' Pettenò [Tue, 25 Jan 2011 00:16:36 +0000 (00:16 +0000)]
Don't check for DEBUG before using dprintf.
The dprintf macro is no-op when DEBUG is unset, so there is no need to
put it conditional to DEBUG.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
73a0b19ba39a4aca79a768feeacd83307a62836e )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:17 +0000 (23:36 +0000)]
Make local variables static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
a6d1bd05c906fc7ad34fae1029a45ec3cbcc4fcc )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:16 +0000 (23:36 +0000)]
Make dvenc.c functions static to the unit.
Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
f0a8676958c8e11c49cf9dd1127cb8937d2a7108 )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:15 +0000 (23:36 +0000)]
Make denoise_dct_c and dct_quantize_trellis_c static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
1d4da6a460d5b78026e3b854fdd6f469957a054c )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:13 +0000 (23:36 +0000)]
Make the ff_lockmgr_cb function pointer static to utils.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
bb875b75bab4d1713f8251746b01785c19965a9f )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:12 +0000 (23:36 +0000)]
Make this_year static to cmdutils.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3568853f63e1ab8ff1fc0773a132d14187a0e2d8 )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:10 +0000 (23:36 +0000)]
Rename sf_table in atrac.c unit to ff_atrac_sf_table.
This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
82e1f217f276b4b3fda1f89a836126275a97ca9b )
Diego Elio Pettenò [Mon, 24 Jan 2011 23:36:09 +0000 (00:36 +0100)]
Mark qmf_window table static to atrac.c unit.
The table is not used anywhere else on libavcodec.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
53493f9a8176009fc514c386ee31cafcafc8539a )
Mans Rullgard [Mon, 24 Jan 2011 23:24:28 +0000 (23:24 +0000)]
x86: fix overflow in h264 8x8 planar prediction
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
80944df720da98d6e5ee0e355db5814735914ec9 )
Mans Rullgard [Sun, 23 Jan 2011 20:33:18 +0000 (20:33 +0000)]
fate: add h264 test for extreme cases in planar prediction
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
e63dd5fb04ab831ca8f17fa824cfd703e317c1a1 )
Mans Rullgard [Sat, 16 Oct 2010 19:56:32 +0000 (20:56 +0100)]
ffserver: put gcc attribute under proper ifdef
(cherry picked from commit
efa6ce9982ffde33b7303498ff28fcf39ff68b8d )
Martin Storsjö [Mon, 10 Jan 2011 10:45:24 +0000 (12:45 +0200)]
rtspdec: Retry with TCP if UDP failed
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
2762a7a28b261a505a9002b92d4f7c04eeaacc1b )
Martin Storsjo [Mon, 24 Jan 2011 09:49:04 +0000 (09:49 +0000)]
rtspdec: Move rtsp_read_pause up, next to rtsp_read_play
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
e836b1b0859798488d8ba45a837dc27bac2ee99f )
Martin Storsjo [Mon, 24 Jan 2011 09:49:03 +0000 (09:49 +0000)]
rtsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
aeb2de1c82f95b74e184992a10523606f4b341fa )
Martin Storsjo [Mon, 24 Jan 2011 09:49:02 +0000 (09:49 +0000)]
rtsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
93e7490ee0c456d7e0fa43e3bf2cb4a8eed19194 )
Martin Storsjo [Mon, 24 Jan 2011 09:49:01 +0000 (09:49 +0000)]
rtsp: Make make_setup_request a nonstatic function
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
fef5649a820b30432578e1440776e7a71bd523cc )
Martin Storsjö [Sun, 23 Jan 2011 21:39:02 +0000 (23:39 +0200)]
applehttp: Fix the key check in handle_variant_args
The key string is supposed to contain the equals character,
too. Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
2b0decf60ba6dd5eec16e88d4b816e56108a2935 )
Kostya [Sat, 22 Jan 2011 13:44:10 +0000 (13:44 +0000)]
reindent after last commit
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
dacbcd170a329dda2014159ca9fc9d11d887625c )
Kostya [Sat, 22 Jan 2011 13:43:15 +0000 (13:43 +0000)]
Extend WavPack demuxer and decoder to support >2 channel audio
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
3bdc886c22710d3207b1bd75f8d2d65ec77cace5 )
Stefano Sabatini [Sun, 23 Jan 2011 01:06:59 +0000 (02:06 +0100)]
Do not set audio_resample to 0 if audio_sync_method is > 1.
If audio_sync_method is >1 the resampler is used for audio drift
compensation, and do_audio_out() was causing an assert failure because
audio_resample was not set.
Fix issue 2516, which was introduced by SVN r25939.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
07b48f8c7adaaf4020514816ec9b8d14cc8c5fbd )
Mans Rullgard [Sun, 23 Jan 2011 20:41:59 +0000 (20:41 +0000)]
ARM: NEON: fix overflow in h264 16x16 planar pred
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
78f318be59a8e6174f21c2d7c3403ef325c73011 )
Mans Rullgard [Sun, 23 Jan 2011 23:13:33 +0000 (23:13 +0000)]
Add CFLAGS needed by PathScale compiler
The PathScale compiler miscompiles wrapping arithmetic without
these flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
5f3b8314a4a9120e0c6d6f153168c37eb849dbe8 )
Mans Rullgard [Sun, 23 Jan 2011 20:48:51 +0000 (20:48 +0000)]
Disable symbol versioning on some BSDs
Dragonfly, NetBSD, and OpenBSD do not support symbol versioning
although our link test passes. Disable it explicitly for these
systems.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
a1e4b3f6d322f61fc8ccae6ecd2586e04ceb7026 )
Mans Rullgard [Thu, 7 Oct 2010 00:25:31 +0000 (01:25 +0100)]
MIPS: use inline asm only when supported by compiler
(cherry picked from commit
7a5a168abe36c91087e58d89262a3658d21ea2cc )
Janne Grunau [Sun, 23 Jan 2011 14:45:19 +0000 (15:45 +0100)]
aacenc: fix typo in sync extension constant in
8ae0fa2
(cherry picked from commit
2fd9035ddc4f6b9313023891a16b6e9820d958ed )
Jai Menon [Tue, 25 Jan 2011 04:55:43 +0000 (22:55 -0600)]
ffmetaenc : Use more correct format specifiers.
Additionally, this fixes a warning when building with clang.
Baptiste Coudurier [Thu, 20 Jan 2011 21:14:12 +0000 (13:14 -0800)]
In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it.
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
Reimar Döffinger [Mon, 24 Jan 2011 18:35:20 +0000 (19:35 +0100)]
Use av_fast_malloc instead of av_realloc.
This should be faster, is less code and fixes issue 2524
(allocation error would lead to crash).
Reimar Döffinger [Mon, 24 Jan 2011 17:51:00 +0000 (18:51 +0100)]
Handle input or output len of 0 properly in lzo decoder.
Mans Rullgard [Sun, 23 Jan 2011 02:22:34 +0000 (02:22 +0000)]
Remove redundant checks against MIN_CACHE_BITS
With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
f162e988aa0dc8df93079b5ebf452ec281ab8793 )
Mans Rullgard [Sun, 23 Jan 2011 14:01:43 +0000 (14:01 +0000)]
get_bits: move tracing macros to end of file
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
611a6f59ce91947b25033bb8d0f9311b5c542b05 )
Mans Rullgard [Sun, 23 Jan 2011 01:56:27 +0000 (01:56 +0000)]
Sanitise get_bits macros, part 2
These whitespace changes improve the readability of the get_bits
macros.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
fb5c841d5f05ae54b699ba6ef28356a6563751eb )
Mans Rullgard [Sun, 23 Jan 2011 01:24:46 +0000 (01:24 +0000)]
Sanitise get_bits macros, part 1
Some of the macros in get_bits.h include a final semicolon,
some do not. This removes these or adds do {} while(0) around
the macros as appropriate and adds semicolons where needed in
calling code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
bf5f9b528b4117596afc57578a36e7b5728b15d3 )
Mans Rullgard [Sun, 23 Jan 2011 01:18:13 +0000 (01:18 +0000)]
Remove "libmpeg2" bitstream reader
Using the libmpeg2 reader causes errors in a multitude of places,
including MPEG and H264 codecs. As the advantage of this reader
is questionable, removing it seems the sensible course of action,
especially considering the simplifications this allows elsewhere
with the bit cache size increasing from 17 to 25 bits as minimum.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
938f72e19957e9ee3f4ae2bee2fb53ded359009f )
Mans Rullgard [Thu, 20 Jan 2011 02:07:55 +0000 (02:07 +0000)]
Makefile: simplify test tools handling
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
2b39962eb616bdb848673485d7b9feed48d39e36 )
Reinhard Tartler [Sun, 23 Jan 2011 07:53:40 +0000 (08:53 +0100)]
ffserver: cleanup
remove the trivial function do_switch_stream as it doesn't help to make
the code easier to understand.
(cherry picked from commit
305ca590cfdbb8ffbe32c6ed26825489a640ff05 )
Justin Ruggles [Thu, 13 Jan 2011 20:28:06 +0000 (15:28 -0500)]
ac3enc: use dsputil functions in apply_window()
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
3b924294ea0ab891cf28fb30f26962a7960f7f37 )
Justin Ruggles [Thu, 13 Jan 2011 20:28:06 +0000 (15:28 -0500)]
Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
6eabb0d3ad42b91c1b4c298718c29961f7c1653a )
Ronald S. Bultje [Sat, 22 Jan 2011 14:42:57 +0000 (14:42 +0000)]
Reindent.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
fcb7e535dd9ad142c079af62af9c1d0f4b001057 )
Ronald S. Bultje [Sat, 22 Jan 2011 14:42:56 +0000 (14:42 +0000)]
Fix crash on resolution change (issue 2393).
Don't free RBSP tables (containing decoded NAL units) on resolution
change, because we actually need this data to decode the frame after
reiniting (with new resolution). Fixed issue 2393.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
9107892624c8f9978489ab5b4c0ef2fc5637fb62 )
Mans Rullgard [Thu, 20 Jan 2011 02:04:54 +0000 (02:04 +0000)]
Make LOCAL_ALIGNED macro fully C99 compatible
C99 variadic macros require more arguments than there are named
parameters in the definition. This means we must use an extra
indirection to avoid having two different macros for arrays with
one resp more than one dimension.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
96aad41e8157b7c6b577803054e20a0771857424 )
Alex Converse [Sat, 22 Jan 2011 03:49:55 +0000 (03:49 +0000)]
Remove H.264 encoder fragments
It's incomplete, no one is working on it, and when someone asks about
working on it we advise them not to.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
ff3d43104fa5df0a3f4b52ff9b989ce2d11ad35d )
Alex Converse [Sat, 22 Jan 2011 05:23:43 +0000 (05:23 +0000)]
aacenc: mark SBR absent
Use backwards compatible explicit signalling to denote the absence of
SBR.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
8ae0fa243e1f7a03cb5f23e2d9a32d3cc88b4def )
Stefano Sabatini [Fri, 21 Jan 2011 12:54:14 +0000 (13:54 +0100)]
Amend documentation for the image2 demuxer, to better reflect the current behavior.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
10ed96c78fde80da9d5bac9b267369861a4f33ba )
Stefano Sabatini [Sat, 22 Jan 2011 11:07:03 +0000 (11:07 +0000)]
Remove outdated and confusing comment.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
db2ddd38859b26c0a4e4bf92619625cd7e0e7f42 )
Justin Ruggles [Fri, 21 Jan 2011 20:59:20 +0000 (20:59 +0000)]
10l: reverse the biquad coefficients.
I did not notice that the filter implementation uses a reversed history state.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
98cfadd648bfb2ab48e4c18d832e946a1ba050c8 )
Mike Scheutzow [Sat, 15 Jan 2011 16:11:55 +0000 (16:11 +0000)]
streamid does not work with newaudio, newvideo, newsubtitle
fixes issue2465.
The problem is that the ffmpeg (the app) -streamid option did not work
with -newaudio/-newvideo/-newsubtitle.
The cause was a conflict between the feature where streamid values were
reset to default for each output filename, and the implementation of
-new*, which requires that the -new* option be specified after the
target filename.
My patch changes the ffmpeg behavior so that user-specified streamid
values apply to all the following output files on the command line
(rather than just the next output filename.)
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
20ac9de3df9b129a4a312d626fed0e2bbb760200 )
Mans Rullgard [Thu, 20 Jan 2011 22:20:39 +0000 (22:20 +0000)]
fate: add lossless h264 test
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
76edf2c1377fdb35609f79a6702081de4d93e331 )
Anssi Hannula [Fri, 21 Jan 2011 21:58:54 +0000 (21:58 +0000)]
libfaac: add recognized profiles array
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
b92f76e209b6912fb36ea2e588474c48ca231dea )
Anton Khirnov [Fri, 21 Jan 2011 19:54:35 +0000 (19:54 +0000)]
mp3enc: support for id3v2.3 tags using a per-muxer AVOption
fixes issue2562.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit
22272f61bb0b164b53c132ba0804842b66b871e0 )