1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

27755 Commits

Author SHA1 Message Date
Mans Rullgard
4c56b4bc01 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 e781c4e6ff)
2011-01-26 03:43:31 +01:00
Mans Rullgard
8fa28af965 tty: remove superflous #include <strings.h>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1e48cdaac3)
2011-01-26 03:43:30 +01:00
Mans Rullgard
8169afdb15 ac3: remove ff_ac3_critical_band_size_tab[] external declaration
This fixes compilation broken by 6ed3b504f9

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 21c900129c)
2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
6b784f1b91 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 6ed3b504f9)
2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
a172126c38 Remove unused ac3_parametric_bit_allocation function.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362bfe2997)
2011-01-26 03:43:30 +01:00
Mans Rullgard
3ae2a7575d 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 3d157bf31f)
2011-01-26 03:43:30 +01:00
Daniel Verkamp
121053b2d6 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 54fe299b88)
2011-01-26 03:43:30 +01:00
Georgi Chorbadzhiyski
4fee6f32e2 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 6e78c8ee94)
2011-01-26 03:43:30 +01:00
Daniel Verkamp
859749e088 Fix ALLPROGS_G so that *_g binaries get cleaned properly
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3adbe49f2b)
2011-01-26 03:43:30 +01:00
Mans Rullgard
8719b5dd60 latm: remove superflous #includes
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e153e9a53a)
2011-01-26 03:43:30 +01:00
Mans Rullgard
3e8c4f9689 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 6081f8c4e2)
2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
53d3f66bae Make RTPFirstDynamicPayloadHandler static to rtpdec.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 119cc033fc)
2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
c2ec089c5a Make ff_realmedia_mp3_dynamic_handler static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69ad22c7a7)
2011-01-26 03:43:30 +01:00
Mans Rullgard
e164311179 Make denoise_dct_c() and dct_quantize_trellis_c() static in definitions
1d4da6a460 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 aa61e39eac)
2011-01-26 03:43:30 +01:00
Diego Elio Pettenò
11c7f64a9c 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 5b5083b5fe)
2011-01-26 03:43:29 +01:00
Diego Elio 'Flameeyes' Pettenò
463532310a 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 73a0b19ba3)
2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
41727b8522 Make local variables static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a6d1bd05c9)
2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
81c38db13c 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 f0a8676958)
2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
295edc7794 Make denoise_dct_c and dct_quantize_trellis_c static.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1d4da6a460)
2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
291f326a2e Make the ff_lockmgr_cb function pointer static to utils.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bb875b75ba)
2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
7a0e1be839 Make this_year static to cmdutils.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3568853f63)
2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
ee7fed27d4 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 82e1f217f2)
2011-01-26 03:43:29 +01:00
Diego Elio Pettenò
f7e5cc0a2c 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 53493f9a81)
2011-01-26 03:43:29 +01:00
Mans Rullgard
e243ed656c x86: fix overflow in h264 8x8 planar prediction
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 80944df720)
2011-01-26 03:43:29 +01:00
Mans Rullgard
c78c182097 fate: add h264 test for extreme cases in planar prediction
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e63dd5fb04)
2011-01-26 03:43:29 +01:00
Mans Rullgard
5658abf8c9 ffserver: put gcc attribute under proper ifdef
(cherry picked from commit efa6ce9982)
2011-01-26 03:43:29 +01:00
Martin Storsjö
4f40ec0552 rtspdec: Retry with TCP if UDP failed
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2762a7a28b)
2011-01-26 03:43:29 +01:00
Martin Storsjo
2afd30bf7a rtspdec: Move rtsp_read_pause up, next to rtsp_read_play
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e836b1b085)
2011-01-26 03:43:28 +01:00
Martin Storsjo
3f44e3c91a 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 aeb2de1c82)
2011-01-26 03:43:28 +01:00
Martin Storsjo
abbc1d272e 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 93e7490ee0)
2011-01-26 03:43:28 +01:00
Martin Storsjo
d89a08d81b rtsp: Make make_setup_request a nonstatic function
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fef5649a82)
2011-01-26 03:43:28 +01:00
Martin Storsjö
1a172ce6b1 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 2b0decf60b)
2011-01-26 03:43:28 +01:00
Kostya
69c78161d2 reindent after last commit
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit dacbcd170a)
2011-01-26 03:43:28 +01:00
Kostya
8a485dd399 Extend WavPack demuxer and decoder to support >2 channel audio
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3bdc886c22)
2011-01-26 03:43:28 +01:00
Stefano Sabatini
0f16f72552 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 07b48f8c7a)
2011-01-26 03:43:28 +01:00
Mans Rullgard
0fc1961ecc ARM: NEON: fix overflow in h264 16x16 planar pred
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 78f318be59)
2011-01-26 03:43:28 +01:00
Mans Rullgard
a98ffb2bc8 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 5f3b8314a4)
2011-01-26 03:43:28 +01:00
Mans Rullgard
355d05280a 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 a1e4b3f6d3)
2011-01-26 03:43:28 +01:00
Mans Rullgard
d112aa5acc MIPS: use inline asm only when supported by compiler
(cherry picked from commit 7a5a168abe)
2011-01-26 03:43:28 +01:00
Janne Grunau
604eb152fc aacenc: fix typo in sync extension constant in 8ae0fa2
(cherry picked from commit 2fd9035ddc)
2011-01-26 03:43:27 +01:00
Jai Menon
9de202a633 ffmetaenc : Use more correct format specifiers.
Additionally, this fixes a warning when building with clang.
2011-01-24 22:55:43 -06:00
Baptiste Coudurier
d4e0130e46 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.
2011-01-24 14:20:48 -08:00
Reimar Döffinger
e7b95918fc 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).
2011-01-24 19:35:20 +01:00
Reimar Döffinger
7d5082600e Handle input or output len of 0 properly in lzo decoder. 2011-01-24 18:52:08 +01:00
Mans Rullgard
91d51ee4b5 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 f162e988aa)
2011-01-23 19:32:09 +01:00
Mans Rullgard
a4bff12cdd get_bits: move tracing macros to end of file
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 611a6f59ce)
2011-01-23 19:32:09 +01:00
Mans Rullgard
371cf026a7 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 fb5c841d5f)
2011-01-23 19:32:09 +01:00
Mans Rullgard
d232e09d51 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 bf5f9b528b)
2011-01-23 19:32:08 +01:00
Mans Rullgard
990f213e57 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 938f72e199)
2011-01-23 19:32:08 +01:00
Mans Rullgard
51cfd81238 Makefile: simplify test tools handling
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2b39962eb6)
2011-01-23 19:32:08 +01:00