virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
34,207 Commits 37 Branches 400 Tags 465 MiB
b601ded799
Commit Graph

34207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Reimar Döffinger
b601ded799 Add prores regression test. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-29 16:19:34 +02:00
Hendrik Leppkes
8689d87ac6 Revert "matroskadec: forward parsing errors to caller." 
This reverts commit 5dd514af93.
Silently ignoring errors allows some broken files to simply be played, instead of failing.
(cherry picked from commit 7804b0693375c1a7ba1046f7a3579e9f63c2b15a)

The intended goal (as confirmed with its author) of fixing a crash has been
fixed differently prior to the application of this patch and this patch does
notsucessfully propagate parse errors either.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-29 15:57:26 +02:00
Reimar Döffinger
c5865a8967 Use bytestream functions to write header. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-29 15:48:43 +02:00
Reimar Döffinger
d9f4dc52a0 Only do 1 malloc instead of 3 and check for failure. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-29 15:48:43 +02:00
Reimar Döffinger
5c9b9165cd Remove unnecessary memset. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-29 15:48:43 +02:00
Reimar Döffinger
a2db46b883 Remove useless casts. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-29 15:48:43 +02:00
Reimar Döffinger
eac778deb3 Some minor spelling fixes. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-10-29 14:51:31 +02:00
Carl Eugen Hoyos
4d2f991187 Bump libavcodec minor version for the ProRes encoder. 2011-10-29 13:17:08 +02:00
Carl Eugen Hoyos
7afa6b4458 Warn if YCgCo colourspace is detected in H.264. 2011-10-29 13:16:47 +02:00
Carl Eugen Hoyos
7e05542aea Add Vladimir Voroshilov's copyright header to bit.c. 2011-10-29 13:16:47 +02:00
Anatoliy Wasserman
70bab5847e Apple ProRes encoder 
Signed-off-by: Anatoliy Wasserman <anatoliy.wasserman@yandex.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-29 12:46:05 +02:00
Michael Niedermayer
6faf0a21e1 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (53 commits)
  probe: Restore identification of files with very large id3 tags and no extension.
  probe: Remove id3 tag presence as a criteria to do file extension checking.
  mpegts: MP4 SL support
  mpegts: MP4 OD support
  mpegts: Add support for Sections in PMT
  mpegts: Replace the MP4 descriptor parser with a recursive parser.
  mpegts: Add support for multiple mp4 descriptors
  mpegts: Parse mpeg2 SL descriptors.
  isom: Add MPEG4SYSTEMS dummy object type indication.
  aacdec: allow output reconfiguration on channel changes
  nellymoserenc: take float input samples instead of int16
  nellymoserdec: use dsp functions for overlap and windowing
  nellymoserdec: do not fail if there is extra data in the packet
  nellymoserdec: fail if output buffer is too small
  nellymoserdec: remove pointless buffer size check.
  lavf: add init_put_byte() to the list of visible symbols.
  seek-test: free options dictionary after use
  snow: do not draw_edge if emu_edge is set
  tools/pktdumper: update to recent avformat api
  seek-test: update to recent avformat api
  ...

Conflicts:
	doc/APIchanges
	libavcodec/mpegaudiodec.c
	libavcodec/nellymoserdec.c
	libavcodec/snow.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/avformat.h
	libavformat/mpegts.c
	libavformat/mxfdec.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-29 02:08:54 +02:00
Alex Converse
61856d06eb probe: Restore identification of files with very large id3 tags and no extension. 
Restore behavior of identifying files with huge id3 tags as
mp3 at AVPROBE_SCORE_MAX/4. This was broken in r25378 and subsequently
removed in r25929.
 2011-10-28 15:44:10 -07:00
Alex Converse
7a773d4d59 probe: Remove id3 tag presence as a criteria to do file extension checking. 
This only encourages our users to put id3v2 tags on non-mp3 files to opt
into extension based probing.
 2011-10-28 15:44:09 -07:00
Alex Converse
ca65932bbf mpegts: MP4 SL support 2011-10-28 14:54:14 -07:00
Alex Converse
c530267024 mpegts: MP4 OD support 2011-10-28 14:54:14 -07:00
Alex Converse
4682a1dc3a mpegts: Add support for Sections in PMT 2011-10-28 14:54:14 -07:00
Alex Converse
fec2836483 mpegts: Replace the MP4 descriptor parser with a recursive parser. 2011-10-28 14:54:14 -07:00
Alex Converse
c3bc6096f2 mpegts: Add support for multiple mp4 descriptors 2011-10-28 14:54:13 -07:00
Alex Converse
476d04a56a mpegts: Parse mpeg2 SL descriptors. 2011-10-28 14:54:13 -07:00
Alex Converse
77b5c82b49 isom: Add MPEG4SYSTEMS dummy object type indication. 2011-10-28 14:54:13 -07:00
Michael Niedermayer
bc2dd36740 aacdec: allow output reconfiguration on channel changes 
Locking the decoder against channel config changes in
parse_adts_frame_header() seems to be unnecessary and
streams with channel config changes are reported.

The sample in http://roundup.libav.org/issue999 still works.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-10-28 22:44:59 +02:00
Anton Khirnov
ed1aa89217 lavf: add init_put_byte() to the list of visible symbols. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-28 21:46:30 +02:00
Justin Ruggles
f3db0f7403 nellymoserenc: take float input samples instead of int16 
This avoids having to convert all input data from int16 to float, which is used
internally for encoding.
 2011-10-28 14:40:52 -04:00
Justin Ruggles
77c8ef9a36 nellymoserdec: use dsp functions for overlap and windowing 2011-10-28 14:40:52 -04:00
Justin Ruggles
8c9581f052 nellymoserdec: do not fail if there is extra data in the packet 
instead just print a warning
 2011-10-28 14:40:52 -04:00
Justin Ruggles
0aaa85dbed nellymoserdec: fail if output buffer is too small 
avoids silently truncating the output
 2011-10-28 14:40:52 -04:00
Justin Ruggles
f19305fe93 nellymoserdec: remove pointless buffer size check. 2011-10-28 14:40:51 -04:00
Anton Khirnov
854eadccb6 lavf: add init_put_byte() to the list of visible symbols. 2011-10-28 20:06:34 +02:00
Janne Grunau
c12ef64d69 seek-test: free options dictionary after use 2011-10-28 19:50:44 +02:00
Michael Niedermayer
8fa97302e0 snow: do not draw_edge if emu_edge is set 
Fix segfault on emu edge, to reproduce

make fate-vsynth1-snow
avplay -flags emu_edge tests/data/vsynth1/snow.avi

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-10-28 10:14:11 -07:00
Carl Eugen Hoyos
246c8dac3e Fix dca decoding for many samples after last commit. 
Still be less verbose about channel count change from 0 channels.
 2011-10-28 19:13:59 +02:00
Janne Grunau
d830264abd tools/pktdumper: update to recent avformat api 2011-10-28 19:08:38 +02:00
Janne Grunau
d88e9f1c07 seek-test: update to recent avformat api 2011-10-28 19:08:37 +02:00
Carl Eugen Hoyos
ad2d597292 Be less verbose about dca channel number changes. 
Only inform the user that the number of channels changed if it was set
before.
 2011-10-28 18:21:40 +02:00
Carl Eugen Hoyos
81cd96caee Remove unused dca context variable. 2011-10-28 18:20:37 +02:00
Justin Ruggles
813907d424 wmavoice: move output buffer size check to synth_superframe(). 
this allows for checking against the actual output size instead of max size.
 2011-10-28 12:02:24 -04:00
Justin Ruggles
d064076570 wmavoice: only set data_size to 0 when necessary 2011-10-28 12:02:24 -04:00
Justin Ruggles
1db6437f6c wmapro: fix strict-aliasing violations by using av_alias32 
Also fix some undefined unsigned/signed conversions.
 2011-10-28 12:02:24 -04:00
Justin Ruggles
b8b4c9c328 wmapro: use FmtConvertContext.float_interleave() to interleave output samples 2011-10-28 12:02:24 -04:00
Justin Ruggles
d0b1b1c5c7 wmadec: consolidate 2 output buffer size checks into 1 check 2011-10-28 12:02:23 -04:00
Justin Ruggles
9a33264478 apedec: assert that s->samples is not negative before trying to decode 2011-10-28 11:47:29 -04:00
Justin Ruggles
0927154d37 apedec: use FFALIGN macro for internal data buffer size 2011-10-28 11:47:28 -04:00
Justin Ruggles
5b8009f4c8 apedec: do not keep incrementing the input data pointer past the end of the 
buffer during entropy decoding.

The pointer address could overflow, which would likely segfault. Instead set
the context error flag to indicate that the decoder tried to read past the
end of the packet data.
 2011-10-28 11:47:28 -04:00
Justin Ruggles
a4c32c9a63 apedec: check for input buffer overflow while reading frame header 2011-10-28 11:47:28 -04:00
Justin Ruggles
fd244ae3a0 apedec: use unsigned int for offset 
avoids implementation-defined unsigned-to-signed conversion and simplifies
the bounds checking.
 2011-10-28 11:47:28 -04:00
Justin Ruggles
89ec474a43 apedec: remove pointless increment of 'buf' 
The variable is not used anymore at that point.
 2011-10-28 11:47:28 -04:00
Justin Ruggles
52d4fb2a3d apedec: set s->currentframeblocks after validating nblocks 2011-10-28 11:47:28 -04:00
Justin Ruggles
2cab578489 apedec: use unsigned int for 'nblocks' and make sure that it's within int range 2011-10-28 11:47:27 -04:00
Justin Ruggles
b7e5145759 apedec: do not set s->samples until after validation. 
This prevents errors and/or invalid writes in the next decode call due to
s->samples still being negative.
 2011-10-28 11:47:27 -04:00