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

27477 Commits

Author SHA1 Message Date
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
Reinhard Tartler
bf7aa642c3 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 305ca590cf)
2011-01-23 19:32:08 +01:00
Justin Ruggles
eddf8f4100 ac3enc: use dsputil functions in apply_window()
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3b924294ea)
2011-01-23 19:32:08 +01:00
Justin Ruggles
015f9f1ad3 Change DSPContext.vector_fmul() from dst=dst*src to dest=src0*src1.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6eabb0d3ad)
2011-01-23 19:32:08 +01:00
Ronald S. Bultje
fb397b1a19 Reindent.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fcb7e535dd)
2011-01-23 19:32:08 +01:00
Ronald S. Bultje
2ed0f76655 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 9107892624)
2011-01-23 19:32:08 +01:00
Mans Rullgard
60c99b5510 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 96aad41e81)
2011-01-23 19:32:08 +01:00
Alex Converse
d5ec00ba57 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 ff3d43104f)
2011-01-23 19:32:08 +01:00
Alex Converse
d67a6aa59c 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 8ae0fa243e)
2011-01-23 19:32:08 +01:00
Stefano Sabatini
e6d4019503 Amend documentation for the image2 demuxer, to better reflect the current behavior.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 10ed96c78f)
2011-01-23 19:32:08 +01:00
Stefano Sabatini
22f73157b7 Remove outdated and confusing comment.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit db2ddd3885)
2011-01-23 19:32:07 +01:00
Justin Ruggles
ff5eded449 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 98cfadd648)
2011-01-23 19:32:07 +01:00
Mike Scheutzow
ba0dd9e8ff 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 20ac9de3df)
2011-01-23 19:32:07 +01:00
Mans Rullgard
73fd7c1f0a fate: add lossless h264 test
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 76edf2c137)
2011-01-23 19:32:07 +01:00
Anssi Hannula
890b771cc1 libfaac: add recognized profiles array
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit b92f76e209)
2011-01-23 19:32:07 +01:00
Anton Khirnov
5b7e7544e1 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 22272f61bb)
2011-01-23 19:32:07 +01:00
Anton Khirnov
fe01dd8d74 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 cb6bc57681)
2011-01-23 19:32:07 +01:00
Anton Khirnov
5052830fec 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 187e23478b

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8c3caf7fb1)
2011-01-23 19:32:07 +01:00
Clément Bœsch
204a18151c Move ID3v1 skip from decoder to demuxer
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 045b80e52d)
2011-01-23 19:32:07 +01:00
Mans Rullgard
05238927b7 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 f4b1e21a63)
2011-01-23 19:32:07 +01:00
Anssi Hannula
6345dfcfd0 dca: add profile names
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f4096bf6ee)
2011-01-23 19:32:07 +01:00
Justin Ruggles
17d4f4558e iir: Change dst param to float* in ff_iir_filter_flt().
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69915b48d6)
2011-01-23 19:32:07 +01:00
Anssi Hannula
cf9cb1f99a 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 8f4a5d225c)
2011-01-23 19:32:07 +01:00
Anton Khirnov
b6125545da 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 187e23478b)
2011-01-23 19:32:07 +01:00
Mans Rullgard
c7892b418b Fix libavformat version extraction in configure
This fixes shared library builds broken by
50196a982b

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4ad66441c9)
2011-01-23 19:32:07 +01:00
Mans Rullgard
727a20cb60 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 a210bce298)
2011-01-23 19:32:06 +01:00
Mans Rullgard
3df0297567 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 93bb9ff08e)
2011-01-23 19:32:06 +01:00
Anton Khirnov
6e89b61293 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 dccbd97d72)
2011-01-23 19:32:06 +01:00
Anton Khirnov
e910a77b0d 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 4efd5cf34b)
2011-01-23 19:32:06 +01:00