generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,458 Commits 24 Branches 241 Tags 173 MiB
c65dfac466
Commit Graph

14899 Commits

Author SHA1 Message Date
Konstantin Todorov
c65dfac466 mpegvideo.c: K&R formatting and cosmetics. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-25 10:07:19 -08:00
Stefano Sabatini
8a4a5f6ff7 lavc: add format field to AVFrame 
The format is a per-frame property, having it in AVFrame simplify the
operation of extraction of that information, since avoids the need to
access the codec/stream context.
 2011-12-25 16:18:57 +01:00
Stefano Sabatini
3a2ddf7c2c lavc: add width and height fields to AVFrame 
width and height are per-frame properties, setting these values in
AVFrame simplify the operation of extraction of that information,
since avoids the need to check the codec/stream context.
 2011-12-25 16:18:57 +01:00
Stefano Sabatini
b58dbb5b03 lavc: add a sample_aspect_ratio field to AVFrame 
The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.
 2011-12-25 16:18:57 +01:00
Reinhard Tartler
8b94df0f20 vp3dec: Check coefficient index in vp3_dequant() 
Based on a patch by Michael Niedermayer <michaelni@gmx.at>

Fixes NGS00145, CVE-2011-4352

Found-by: Phillip Langlois
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-12-23 15:42:24 +01:00
Michael Niedermayer
6e24b9488e svq1dec: call avcodec_set_dimensions() after dimensions changed. 
Fixes NGS00148, CVE-2011-4579

Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-23 15:42:24 +01:00
Janne Grunau
7052618c7e threads: check defines before using them in automatic thread detection 2011-12-23 14:41:03 +01:00
Janne Grunau
846dca1aa3 pthread: include sys/types.h before sys/sysctl.h 
Fixes compilation on FreeBSD with clang 3.
 2011-12-23 14:40:39 +01:00
Anton Khirnov
d09298f0d6 4xm: remove unused variables. 2011-12-23 09:23:20 +01:00
Alexander Strange
bc6a3bd4a5 h264: Fix a possible overread in decode_nal_units() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-23 08:32:18 +01:00
Sergey Radionov
01eb9805f3 w32thread: call ResetEvent() in pthread_cond_broadcast(). 
Also add "volatile" to broadcast flag (since it is used from
multiple threads).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-22 19:48:52 -08:00
Gaurav Narula
ad3161ec1d kvmc: fix invalid reads 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-23 00:11:19 +01:00
Shitiz Garg
355d917c0b 4xm: Add a check in decode_i_frame to prevent buffer overreads 
Fixes bugzilla #135

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-22 23:26:55 +01:00
Paul B Mahol
01a01bf8bd adpcm: fix IMA SMJPEG decoding 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-22 23:04:30 +01:00
Janne Grunau
c32e4029d9 options: set minimum for "threads" to zero 
A negative number of threads does not make sense and 0 is used for
autodetection. Adds a symbolic name for autodetection.
 2011-12-22 21:50:07 +01:00
Janne Grunau
b9e2226972 bsd: use number of logical CPUs as automatic thread count 2011-12-22 21:50:07 +01:00
Janne Grunau
ad29ecbff0 windows: use number of CPUs as automatic thread count 2011-12-22 21:50:07 +01:00
Janne Grunau
ea4d5f4837 linux: use number of CPUs as automatic thread count 
Use sched_getaffinity to determine the number of logical CPUs.
Limits the number of threads to 16 since slice threading of H.264
seems to be buggy with more than 16 threads.
 2011-12-22 21:50:07 +01:00
Janne Grunau
f77f640b30 pthreads: reset active_thread_type when slice thread_init returrns early 2011-12-22 21:50:07 +01:00
Paul B. Mahol
fede015468 v410dec: include correct headers 
This file does not use anything from get_bits.h but needs
intreadwrite.h.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-12-22 19:22:48 +01:00
Diego Biurrun
aaf47bcde7 Drop ALT_ prefix from BITSTREAM_READER_LE name. 
The prefix is a historic remnant that probably meant "alternative".
Now that the A32 bitstream reader has been dropped it makes no sense anymore.
 2011-12-22 16:51:23 +01:00
Justin Ruggles
9a3f10695a ra144enc: zero the reflection coeffs if the filter is unstable 
fixes use of uninitialized values if the filter is still unstable after using
the previous frame lpc coefficients.
 2011-12-22 08:31:07 -05:00
Alex Converse
4bf3c8f226 mov: Don't stick the QuickTime field ordering atom in extradata. 
The 'fiel' atoms can be found in H.264 tracks clobbering the extradata.
MJPEG supports non field based extradata, and this data should be
preserved when copying.
 2011-12-21 22:04:37 -08:00
Justin Ruggles
f264d336fe truespeech: fix invalid reads in truespeech_apply_twopoint_filter() 
fixes Bug 171
 2011-12-21 18:13:06 -05:00
Martin Storsjö
ce94948198 nellymoserdec: Indicate that the decoder can handle changed parameters 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-21 22:52:44 +02:00
Martin Storsjö
f13db94d0a libavcodec: Apply parameter change side data when decoding audio 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-21 22:52:42 +02:00
Martin Storsjö
fe75dc8583 libavcodec: Define a side data type for parameter changes 
Also define a codec capability for codecs that can handle
parameters changed externally between decoded packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-21 22:52:39 +02:00
Martin Storsjö
132846b0c8 aacdec: Handle new extradata passed as side data 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-21 22:52:39 +02:00
Martin Storsjö
195c123cc8 libavcodec: Define a side data type for new extradata 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-21 22:52:36 +02:00
Diego Biurrun
6fdb2ce34a x86: Tighten register constraints for decode_significance*_x86. 
On 32-bit OS X with gcc 4.0/4.2 and shared libraries enabled, the ebx register
is not available, but required to assemble the functions.

This reverts commit 8742a4f to a simplified version of the original constraints.
 2011-12-21 12:06:37 +01:00
Diego Biurrun
c18365402b Replace Subversion revisions in comments by Git hashes. 2011-12-21 09:04:25 +01:00
Diego Biurrun
8742a4ff87 h264_cabac: synchronize decode_significance_*_x86 conditionals 
The definition and the call site where under different #ifdefs.
 2011-12-21 09:04:25 +01:00
Sergey Radionov
2003a29284 w32threads: wait for the waked thread in pthread_cond_signal. 
This fixes a deadlock VLC triggered with multithreaded decoding. The
wait forces one of the current waiters to wake and not the thread
which calls pthread_cond_signal() itself.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-12-20 20:21:10 -08:00
Alex Converse
021914e27f aacdec: Cleanup decode_ics_info. 
Remove unused function argument.
Return an AVERROR.
Don't zero out ICS on failure.
 2011-12-20 18:32:41 -08:00
Rafaël Carré
37c0dc626d lavc: always align height by 32 pixel 
Interlaced content for most codec requires it.
This patch is a stop-gap pending a serious rework to support
codecs with non 16 pixel macroblocks.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-21 00:00:23 +01:00
Luca Barbato
91b1e6f0c6 raw: add 10bit YUV definitions 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-21 00:00:03 +01:00
Diego Biurrun
1ce1578e4e mpegvideo_enc: separate declarations and statements 
libavcodec/mpegvideo_enc.c:1209: warning: ISO C90 forbids mixed declarations and code
 2011-12-20 22:38:54 +01:00
Diego Biurrun
bc4d156140 vp3: Reorder some functions to fix VP3 build with Theora disabled. 2011-12-20 22:38:53 +01:00
Diego Biurrun
19277d9335 build: fix standalone compilation of ADX encoder 
The encoder depends on the common code, so link against it.
 2011-12-20 22:38:52 +01:00
Diego Biurrun
18725fcdc2 build: fix standalone compilation of ADPCM decoders 
The generic ADPCM codes depends on the ADPCM data tables.
 2011-12-20 22:38:51 +01:00
Aneesh Dogra
1443ea93d9 4xm: Use bytestream2 functions to prevent overreads 
Fixes Bug 110.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-20 13:17:09 -05:00
Aneesh Dogra
fd22616c59 bytestream: add a new set of bytestream functions with overread checking 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2011-12-20 13:17:03 -05:00
Martin Storsjö
b797f73520 vc1dec: Use the right pointer type for the tmp pointer 
This fixes warnings about assignment from incompatible
pointer type.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-20 11:04:26 +02:00
Janne Grunau
729ebb2f18 h264: clear trailing bits in partially parsed NAL units 
Trailing bits are likely to be non-zero if the NAL unit is truncated.
Clearing the bits make overreads of the bitstream less likely in this
case. Fixes playback of
http://streams.videolan.org/streams/mp4/Mr_MrsSmith-h264_aac.mp4 which
has a forbidden byte sequence of 0x00 0x00 0x00 in it SPS.
 2011-12-19 23:14:21 +01:00
Aneesh Dogra
0a6aff6936 vc1: Handle WVC1 interlaced stream 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-19 22:22:15 +02:00
Aneesh Dogra
00aad121d8 xl: Fix overreads 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-19 20:36:26 +02:00
Asen Lekov
25c2d76b68 qcelpdec: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-19 16:22:30 +01:00
Diego Biurrun
2fd291846b qcelpdec: cosmetics: drop some pointless parentheses 2011-12-19 16:22:11 +01:00
Diego Biurrun
30bbd5cbc0 x86: conditionally compile dnxhd encoder optimizations 2011-12-19 13:54:10 +01:00
Janne Grunau
358ea75e9e Revert "h264: skip start code search if the size of the nal unit is known" 
This reverts commit 87eebb3454.
 2011-12-19 03:24:32 +01:00