cdfe94c5ab
aacenc: Write correct length for long identification strings.
...
When the length is the escape value (15), the new length is calculated by
15 + get_bits(8) - 1.
Signed-off-by: Alex Converse <alex.converse@gmail.com >
2012-01-24 12:54:59 -08:00
c77be3a35a
error concealment: initialize block index.
...
Fixes CVE-2011-3941 (out of bounds write)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 21:08:41 +01:00
b8dd555c63
aud: remove unneeded field, audio_stream_index from context
...
There is only one stream, so it will always be index 0.
This also allows for removal of the private context.
2012-01-24 14:13:47 -05:00
be14a37066
aud: fix time stamp calculation for ADPCM IMA WS
...
also allows for removing some unused context fields
2012-01-24 14:13:47 -05:00
10fef6bd6b
aud: simplify header parsing
...
also allows for removing some unused context fields
2012-01-24 14:13:47 -05:00
0e6a8b5cf7
aud: set pts_wrap_bits to 64.
...
Time stamps are not read from the bitstream, so no wrapping is needed.
2012-01-24 14:13:47 -05:00
98c290cc08
cosmetics: indentation
2012-01-24 14:13:46 -05:00
d481227c54
aud: support Westwood SND1 audio in AUD files.
...
Fixes decoding of the handful of "death scream" samples from
"Command and Conquer" that use SND1. e.g.
http://samples.libav.org/game-formats/westwood-aud/nuyell1.aud
http://samples.libav.org/game-formats/westwood-aud/nuyell7.aud
2012-01-24 14:13:46 -05:00
02e7dbf5ad
adpcm_ima_ws: fix stereo decoding
...
Stereo ADPCM IMA WS is planar for VQA version 3 and 2-sample interleaved for
VQA version 2.
2012-01-24 14:13:46 -05:00
220506d23f
avcodec: add a new codec_id for CRYO APC IMA ADPCM.
...
The stereo layout and extradata is significantly different from that in
Westwood IMA ADPCM, so a separate codec_id is warranted.
2012-01-24 14:13:41 -05:00
4340a6363e
vqa: remove unused context fields, audio_samplerate and audio_bits
2012-01-24 14:08:29 -05:00
7e813d5933
vqa: clean up audio header parsing
...
Fix setting of bit_rate and bits_per_coded_sample.
Ask for sample for unsupported VQA versions.
2012-01-24 14:08:29 -05:00
5b4c562897
vqa: set time base to frame rate as coded in the header.
...
According to Multimedia Wiki documentation, the frame rate is not always 15,
and the actual value can be found in the header.
2012-01-24 14:08:29 -05:00
9ae846971f
vqa: set packet duration.
...
Also remove unused context field, audio_frame_counter.
2012-01-24 14:08:29 -05:00
53ed79a260
vqa: use 1/sample_rate as the audio stream time base
2012-01-24 14:08:29 -05:00
e1ac69fa27
vqa: set stream start_time to 0.
...
The format has no coded timestamps and must use packet durations to generate
them.
2012-01-24 14:08:29 -05:00
1381e9bc92
lavc: postpone the removal of AVCodecContext.request_channels.
...
Although it has been deprecated for a long time, its intended
replacement (request_channel_layout) is not actually used anywhere, so
request_channels is currently the only way to access that functionality.
2012-01-24 18:04:19 +01:00
dc7ad30fa5
lavf: postpone removing av_close_input_file().
...
It has been deprecated only recently.
2012-01-24 18:04:19 +01:00
af0292f33a
lavc: postpone removing old audio encoding and decoding API
...
It has been deprecated only recently.
2012-01-24 18:04:19 +01:00
75e2025f57
avplay: remove the -er option.
...
Error recognition flags can and should be set directly with AVOptions.
2012-01-24 18:04:19 +01:00
941e9f2238
lavd: remove deprecated v4l grab device.
2012-01-24 18:04:19 +01:00
f1721fbc52
Merge remote-tracking branch 'tjoppen/mxf_fixes_20120124'
...
* tjoppen/mxf_fixes_20120124:
mxfdec: Fix files > 2 GiB
mxfdec: Handle small EditUnitByteCount
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 17:15:55 +01:00
62d2a75b02
Added clockwise rotate values to metadata for 90 and 270 degrees
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 17:01:10 +01:00
6813450209
lavf: replace remaining use of deprecated get_strz()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 17:01:10 +01:00
1c910d2f11
sws: Fix RGB0->alpha containing formats.
...
Fixes Ticket869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 17:01:10 +01:00
fa94f8a848
buildsys: Fix shared lib build of ffserver.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 17:01:10 +01:00
79f80f5c1f
build: Allow building old API/ABI libpostproc version
...
Allows our users to still build against a libpostproc with the old
API/ABI. Distributions can use this option to defer the soname bump.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 17:01:10 +01:00
5dfc7f7342
doc: add Timecode documentation.
2012-01-24 16:20:21 +01:00
cfa2963b7e
maintainers: add myself for recent works.
2012-01-24 16:07:53 +01:00
0c9ddc0fd5
faq: fix typo.
...
Reported-By: Clément Bœsch
2012-01-24 16:03:09 +01:00
9aaa70a845
faq: document af_aconvert quirks using lavfi.
2012-01-24 15:56:10 +01:00
ece329d629
Add myself as mxfdec maintainer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 15:36:38 +01:00
beb19a0444
h264: Disallow w/h/pixfmt changes for frame threads.
...
Previously this was just checked in case of slice threads,
but frame threads do not support this either currently.
Making them support this is of course the long term goal
Fixes bug155
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 15:36:38 +01:00
b2be1dabb1
mpegvideo: Draw edges based on the pictures linesize instead of the contexts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 15:36:38 +01:00
20aed9ed4f
ffmpeg: Allocate buffers of the size needed by the decoder.
...
Fixes bug127
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 15:36:38 +01:00
969ba65ecc
libcelt: configure: distinguish not found and too old.
...
Fixes ticket #940 .
2012-01-24 13:23:02 +01:00
b720915be1
mxfdec: Fix files > 2 GiB
...
Accumulating into an int would cause overflow for files with essence
containers larger than 2 GiB.
2012-01-24 12:42:32 +01:00
af21823ae0
lavfi: require libswr for af_pan.
2012-01-24 12:11:04 +01:00
1fa88f343a
lavd/lavfi: add dumpgraph option.
2012-01-24 11:38:56 +01:00
0c3577bfd9
lavfi: add avfilter_graph_dump.
2012-01-24 11:38:36 +01:00
d8531a1c18
mxfdec: Handle small EditUnitByteCount
...
These are common with audio atoms. Without this the demuxer would read two
bytes at a time for a mono 16-bit file.
2012-01-24 11:36:39 +01:00
9bd44b42a8
pan: drop unecessary includes.
2012-01-24 10:43:42 +01:00
66b1b7e5fa
pan: move query_formats() to avoid forward declarations.
2012-01-24 10:43:42 +01:00
94dc4a5046
pan: reindent after remap commit.
2012-01-24 10:43:41 +01:00
6728dd37ac
pan: add channel mapping capability.
2012-01-24 10:43:41 +01:00
66fdbcbbc9
pan: raise correct error when there is no param specified.
2012-01-24 10:43:41 +01:00
d1ad6bdb6b
Changelog: restore version <next> header
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2012-01-24 13:57:59 +08:00
0bb57f8bf0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Remove ffmpeg.
aacenc: Simplify windowing
aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.
aacenc: Deinterleave input samples before processing.
aacenc: Store channel count in AACEncContext.
aacenc: Move Q^3/4 calculation to it's own table
aacenc: Request normalized float samples instead of converting s16 samples to float.
aacpsy: Replace an if with FFMAX in LAME windowing.
aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.
aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
aacenc: cosmetics: move init() and end() to the bottom of the file.
aacenc: aac_encode_init() cleanup
XWD encoder and decoder
vc1: don't read the interpfrm and bfraction elements for interlaced frames
mxfdec: fix memleak on mxf_read_close()
westwood: split the AUD and VQA demuxers into separate files.
Conflicts:
.gitignore
Changelog
Makefile
configure
doc/ffmpeg.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/aacenc.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/img2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-01-24 02:41:53 +01:00
b955d4072e
Revert "Fix multi-channel AAC encoding."
...
This reverts commit b3452771c4
2012-01-24 02:31:56 +01:00
1d3a9e63e0
rv10: verify slice offsets against buffer size
...
Found by John Villamil <johnv@matasano.com > in fuzzed rv20 in mkv files.
2012-01-24 02:16:02 +01:00
