]> git.sesse.net Git - ffmpeg/log
ffmpeg
13 years agoffmetaenc: Use correct format specifiers.
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)

13 years agointfloat_readwrite: include "mathematics.h" for fallback macros
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)

13 years agotty: remove superflous #include <strings.h>
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)

13 years agoac3: remove ff_ac3_critical_band_size_tab[] external declaration
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)

13 years agoMove ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables.
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)

13 years agoRemove unused ac3_parametric_bit_allocation function.
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)

13 years agoMakefile: fix cleaning of tools in tests directory
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)

13 years agoconfigure: move network tests before results are needed
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)

13 years agompegtsenc: remove unused variables
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)

13 years agoFix ALLPROGS_G so that *_g binaries get cleaned properly
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)

13 years agolatm: remove superflous #includes
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)

13 years agoavidec: make print_tag() a macro and remove related ifdefs
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)

13 years agoMake RTPFirstDynamicPayloadHandler static to rtpdec.c
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)

13 years agoMake ff_realmedia_mp3_dynamic_handler static.
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)

13 years agoMake denoise_dct_c() and dct_quantize_trellis_c() static in definitions
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)

13 years agoDon't declare a pcm_dvd encoder.
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)

13 years agoDon't check for DEBUG before using dprintf.
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)

13 years agoMake local variables static.
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)

13 years agoMake dvenc.c functions static to the unit.
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)

13 years agoMake denoise_dct_c and dct_quantize_trellis_c static.
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)

13 years agoMake the ff_lockmgr_cb function pointer static to utils.c
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)

13 years agoMake this_year static to cmdutils.c
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)

13 years agoRename sf_table in atrac.c unit to ff_atrac_sf_table.
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)

13 years agoMark qmf_window table static to atrac.c unit.
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)

13 years agox86: fix overflow in h264 8x8 planar prediction
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)

13 years agofate: add h264 test for extreme cases in planar prediction
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)

13 years agoffserver: put gcc attribute under proper ifdef
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)

13 years agortspdec: Retry with TCP if UDP failed
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)

13 years agortspdec: Move rtsp_read_pause up, next to rtsp_read_play
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)

13 years agortsp: Use ff_rtsp_undo_setup in the cleanup code in ff_rtsp_make_request
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)

13 years agortsp: Split out a function undoing the setup made by ff_rtsp_make_setup_request
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)

13 years agortsp: Make make_setup_request a nonstatic function
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)

13 years agoapplehttp: Fix the key check in handle_variant_args
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)

13 years agoreindent after last commit
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)

13 years agoExtend WavPack demuxer and decoder to support >2 channel audio
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)

13 years agoDo not set audio_resample to 0 if audio_sync_method is > 1.
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)

13 years agoARM: NEON: fix overflow in h264 16x16 planar pred
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)

13 years agoAdd CFLAGS needed by PathScale compiler
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)

13 years agoDisable symbol versioning on some BSDs
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)

13 years agoMIPS: use inline asm only when supported by compiler
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)

13 years agoaacenc: fix typo in sync extension constant in 8ae0fa2
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)

13 years agoffmetaenc : Use more correct format specifiers.
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.

13 years agoIn mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it.
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.

13 years agoUse av_fast_malloc instead of av_realloc.
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).

13 years agoHandle input or output len of 0 properly in lzo decoder.
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.

13 years agoRemove redundant checks against MIN_CACHE_BITS
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)

13 years agoget_bits: move tracing macros to end of file
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)

13 years agoSanitise get_bits macros, part 2
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)

13 years agoSanitise get_bits macros, part 1
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)

13 years agoRemove "libmpeg2" bitstream reader
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)

13 years agoMakefile: simplify test tools handling
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)

13 years agoffserver: cleanup
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)

13 years agoac3enc: use dsputil functions in apply_window()
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)

13 years agoChange DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.
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)

13 years agoReindent.
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)

13 years agoFix crash on resolution change (issue 2393).
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)

13 years agoMake LOCAL_ALIGNED macro fully C99 compatible
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)

13 years agoRemove H.264 encoder fragments
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)

13 years agoaacenc: mark SBR absent
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)

13 years agoAmend documentation for the image2 demuxer, to better reflect the current behavior.
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)

13 years agoRemove outdated and confusing comment.
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)

13 years ago10l: reverse the biquad coefficients.
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)

13 years agostreamid does not work with newaudio, newvideo, newsubtitle
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)

13 years agofate: add lossless h264 test
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)

13 years agolibfaac: add recognized profiles array
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)

13 years agomp3enc: support for id3v2.3 tags using a per-muxer AVOption
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)

13 years agoid3v2: split tables for various ID3v2 versions
Anton Khirnov [Fri, 21 Jan 2011 19:54:34 +0000 (19:54 +0000)]
id3v2: split tables for various ID3v2 versions

This is needed for upcoming ID3v2.3 muxing support.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit cb6bc57681b2ec5232e64db176f41fb2517de146)

13 years agomp3enc: handle errors in id3v2_put_ttag
Anton Khirnov [Sat, 22 Jan 2011 01:00:13 +0000 (02:00 +0100)]
mp3enc: handle errors in id3v2_put_ttag

make the initialization of put clearer

this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478bc5c066ff8eef562925471ac179644e

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8c3caf7fb1be2eb6eb4683b1a0383cba5c25ee19)

13 years agoMove ID3v1 skip from decoder to demuxer
Clément Bœsch [Fri, 21 Jan 2011 22:55:31 +0000 (23:55 +0100)]
Move ID3v1 skip from decoder to demuxer

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 045b80e52df7ba9c97084c946b4929000d5f5bc7)

13 years agofate: make lavfi tests output only md5
Mans Rullgard [Fri, 21 Jan 2011 21:31:21 +0000 (21:31 +0000)]
fate: make lavfi tests output only md5

Instead of saving huge raw files, use the md5: output pseudo-protocol
to calculate the checksum of the file directly.  This is especially
useful when testing on remote targets as it avoids transferring 3.6GB
over the network.
(cherry picked from commit f4b1e21a6304cda58ac36401d8f8dec7ff61d056)

13 years agodca: add profile names
Anssi Hannula [Fri, 21 Jan 2011 22:58:55 +0000 (22:58 +0000)]
dca: add profile names

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

13 years agoiir: Change dst param to float* in ff_iir_filter_flt().
Justin Ruggles [Fri, 21 Jan 2011 21:59:19 +0000 (21:59 +0000)]
iir: Change dst param to float* in ff_iir_filter_flt().

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

13 years agodca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRA
Anssi Hannula [Fri, 21 Jan 2011 20:00:40 +0000 (20:00 +0000)]
dca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRA

DTS-HD HRA streams do not always have an XBR extension in the extension
substream. Instead they can have only XXCh and X96 extensions in
there and still be considered DTS-HD HRA.

This is also confirmed with Onkyo TX-SR607 receiver which recognizes
such a stream as HiRes Audio.

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

13 years agomp3enc: add support for writing UTF-16 tags
Anton Khirnov [Fri, 21 Jan 2011 18:18:09 +0000 (18:18 +0000)]
mp3enc: add support for writing UTF-16 tags

Also it gets rid of some mysterious magic numbers in code.

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

13 years agoFix libavformat version extraction in configure
Mans Rullgard [Fri, 21 Jan 2011 21:35:08 +0000 (21:35 +0000)]
Fix libavformat version extraction in configure

This fixes shared library builds broken by
50196a982bf7c8be9b41053fa0975473c217e709

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

13 years agoconfigure: better test for mktemp
Mans Rullgard [Fri, 21 Jan 2011 19:58:23 +0000 (19:58 +0000)]
configure: better test for mktemp

Some variants of mktemp require a template, so provide one when
checking for the command.  We already supply a template in the
subsequent uses of mktemp.

Thanks to Michael Kostylev.

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

13 years agoconfigure: simplify exit traps
Mans Rullgard [Fri, 21 Jan 2011 19:05:07 +0000 (19:05 +0000)]
configure: simplify exit traps

This does the same thing and also fixes the trapping in
some (possibly broken) shells.

Suggested by Michael Kostylev.

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

13 years agolavf: move ff_put_str16_nolen from asf to avio and rename it
Anton Khirnov [Fri, 21 Jan 2011 19:18:08 +0000 (19:18 +0000)]
lavf: move ff_put_str16_nolen from asf to avio and rename it

It will be useful in the mp3 muxer.

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

13 years agoavio: add av_put_str and deprecate put_strz in favor of it
Anton Khirnov [Fri, 21 Jan 2011 19:18:07 +0000 (19:18 +0000)]
avio: add av_put_str and deprecate put_strz in favor of it

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

13 years agocosmetics related to LPC changes.
Justin Ruggles [Fri, 21 Jan 2011 00:12:18 +0000 (00:12 +0000)]
cosmetics related to LPC changes.

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

13 years agoSeparate window function from autocorrelation.
Justin Ruggles [Fri, 21 Jan 2011 00:12:03 +0000 (00:12 +0000)]
Separate window function from autocorrelation.

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

13 years agoMove lpc_compute_autocorr() from DSPContext to a new struct LPCContext.
Justin Ruggles [Fri, 21 Jan 2011 00:11:44 +0000 (00:11 +0000)]
Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.

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

13 years agolavf: move the version macros to a new header
Anton Khirnov [Fri, 21 Jan 2011 19:18:06 +0000 (19:18 +0000)]
lavf: move the version macros to a new header

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

13 years agoFix out of source tree builds of libmpcodecs.
Michael Niedermayer [Sun, 23 Jan 2011 15:58:32 +0000 (16:58 +0100)]
Fix out of source tree builds of libmpcodecs.

13 years agoid3v2: use an enum for encodings instead of magic numbers.
Anton Khirnov [Wed, 19 Jan 2011 09:13:25 +0000 (10:13 +0100)]
id3v2: use an enum for encodings instead of magic numbers.

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

13 years agoMake demuxers auto-select parsers they need
Mans Rullgard [Fri, 21 Jan 2011 18:12:17 +0000 (18:12 +0000)]
Make demuxers auto-select parsers they need

This makes configure --disable-everything --enable-demuxer=foo
work as expected.

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

13 years agoMakefile: simplify setting of some variables
Mans Rullgard [Thu, 20 Jan 2011 02:04:19 +0000 (02:04 +0000)]
Makefile: simplify setting of some variables

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

13 years agoSplit mp3 demuxer and muxer into separate files.
Anton Khirnov [Fri, 21 Jan 2011 13:53:46 +0000 (13:53 +0000)]
Split mp3 demuxer and muxer into separate files.

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

13 years agodca: pretty-print some tables
Mans Rullgard [Fri, 21 Jan 2011 00:09:31 +0000 (00:09 +0000)]
dca: pretty-print some tables

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

13 years agoiir: change filter type if/else to a switch.
Justin Ruggles [Thu, 20 Jan 2011 21:59:23 +0000 (21:59 +0000)]
iir: change filter type if/else to a switch.

Simplifies error handling and makes it easier to add additional filter types.

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

13 years agoAdd biquad high-pass and low-pass IIR filters.
Justin Ruggles [Thu, 20 Jan 2011 21:26:47 +0000 (21:26 +0000)]
Add biquad high-pass and low-pass IIR filters.

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

13 years agoSet gray (128) U/V planes for chroma-less samples. Fixes two fate samples
Ronald S. Bultje [Thu, 20 Jan 2011 19:00:34 +0000 (14:00 -0500)]
Set gray (128) U/V planes for chroma-less samples. Fixes two fate samples
when played with -flags emu_edge.
(cherry picked from commit 8bcfe7f7fd71e5d548c2cd96d33295ff06a5f6c8)

13 years agoRevert 2a1f431d38ea9c05abb215d70c7dc09cdb6888ab, it broke H264 lossless.
Ronald S. Bultje [Thu, 20 Jan 2011 22:24:19 +0000 (17:24 -0500)]
Revert 2a1f431d38ea9c05abb215d70c7dc09cdb6888ab, it broke H264 lossless.
(cherry picked from commit 66c6b5e2a5e6376c4a5c65b1d96fd7a1580bdfcf)

13 years agoSplit out Butterworth filter coeff init to a separate function.
Justin Ruggles [Thu, 20 Jan 2011 19:06:15 +0000 (19:06 +0000)]
Split out Butterworth filter coeff init to a separate function.

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

13 years agocosmetics: vertical alignment and line wrap
Justin Ruggles [Thu, 20 Jan 2011 18:28:17 +0000 (18:28 +0000)]
cosmetics: vertical alignment and line wrap

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

13 years agoAdd memory allocation failure checks to ff_iir_filter_init_coeffs().
Justin Ruggles [Thu, 20 Jan 2011 18:28:16 +0000 (18:28 +0000)]
Add memory allocation failure checks to ff_iir_filter_init_coeffs().

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

13 years agoMake PNG test depend on PNG codec
Mans Rullgard [Thu, 20 Jan 2011 17:52:13 +0000 (17:52 +0000)]
Make PNG test depend on PNG codec

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

13 years agocosmetics: wrap long line
Justin Ruggles [Thu, 20 Jan 2011 17:04:58 +0000 (17:04 +0000)]
cosmetics: wrap long line

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

13 years agoAdd function ff_iir_filter_flt() to accept floating-point input and output.
Justin Ruggles [Thu, 20 Jan 2011 17:24:06 +0000 (17:24 +0000)]
Add function ff_iir_filter_flt() to accept floating-point input and output.

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

13 years agompegtsenc: prefer metadata keyed with "service_name"
Janne Grunau [Thu, 20 Jan 2011 14:03:47 +0000 (15:03 +0100)]
mpegtsenc: prefer metadata keyed with "service_name"

title metadata is only used as fallback if no service_name is available.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e5fe65512bfc824b9827ed29909a54122582ef2a)