virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity
41,693 Commits 37 Branches 400 Tags
Commit Graph

19387 Commits

Author SHA1 Message Date
Alex Converse
79c8e29a7e aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. 2012-06-04 15:16:17 -07:00
Carl Eugen Hoyos
6b87f0707d Do not try to encode DVCPRO HD, it produces broken files. 2012-06-04 20:42:00 +02:00
Carl Eugen Hoyos
0a3e15690f Allow colour space autodetection when encoding ljpeg. 
This works as expected if the input stream is not yuv4xxp.

Reviewed-by: Paul B Mahol
 2012-06-04 20:01:39 +02:00
Carl Eugen Hoyos
02c2a54bf6 Remove misplaced comment. 2012-06-04 20:01:36 +02:00
Paul B Mahol
b0f6df28de libopenjpeg: YUV410P and YUV411P support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-04 11:44:04 +00:00
Carl Eugen Hoyos
568a592418 Fix compilation condition for some ProRes dsp encoder functions. 
Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
 2012-06-04 12:18:56 +02:00
Carl Eugen Hoyos
84986b4e61 Fix compilation condition for some ProRes dsp decoder functions. 
Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
 2012-06-04 12:15:41 +02:00
Carl Eugen Hoyos
a4b885d55e Fix ProRes decoder Makefile dependencies. 
Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
 2012-06-04 12:07:30 +02:00
Carl Eugen Hoyos
c02ef07881 Fix G.723.1 encoder Makefile dependencies. 2012-06-04 12:06:48 +02:00
Clément Bœsch
6b35f1a2a6 timecode: move timecode muxer options to metadata. 
Some demuxers set a timecode in the format or streams metadata. The
muxers now make use of this metadata instead of a duplicated private
option.

This makes possible transparent copy of the timecode when transmuxing
and transcoding.

-timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The
global ffmpeg -timecode option will set it anyway so no option change
visible for the user.
 2012-06-04 07:41:22 +02:00
Michael Niedermayer
38c9ebd2a9 ffv1dec: print more information for -debug 1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 01:04:03 +02:00
Michael Niedermayer
730d079bf7 ffv1: fix log level of FF_DEBUG_PICT_INFO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 01:04:03 +02:00
Michael Niedermayer
7d82020fcb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  librtmp: return AVERROR_UNKNOWN instead of -1.
  librtmp: don't abuse a variable for two unrelated things.
  librtmp: add rtmp_app and rtmp_playpath private options.
  bmv: add stricter checks for invalid decoded length
  avpacket: fix duplicating side data.
  flv: support stream text data as onTextData

Conflicts:
	libavcodec/bmv.c
	libavformat/flvdec.c
	libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-04 00:33:42 +02:00
Stefano Sabatini
e10eac910a lavc/raw: add test utility for listing fourcc/pix_fmt map 
The test program is useful for checking which raw formats are currently
identified by a codec tag.
 2012-06-04 00:07:24 +02:00
Michael Niedermayer
a5c7525bcb set some categories of some AVClass structs 
Please help setting the category for all remaining AVClasses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 21:55:50 +02:00
Michael Niedermayer
44c10168cf mpc8: fix channel checks 
fix heap array overflow

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 17:40:30 +02:00
Michael Niedermayer
a5ad3c2382 av_get_audio_frame_duration: fix FPE 
Fixes ticket1392

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 17:12:57 +02:00
Kostya Shishkov
96fadfb158 bmv: add stricter checks for invalid decoded length 
This makes decoder handle random data passed as BMV frame data.
 2012-06-03 15:26:11 +02:00
Michael Niedermayer
6df1cfa7e4 mace: check channel count, fixes FPE 
Fixes ticket1391

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 15:01:34 +02:00
Michael Niedermayer
cc229d4e83 h263: disable loop filter with lowres 
Fixes ticket1212

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 15:01:34 +02:00
Anton Khirnov
cf3a1948e9 avpacket: fix duplicating side data. 
Use correct side data size instead of just zeroed field.
 2012-06-03 10:22:42 +02:00
Mans Rullgard
d0f34c96b1 aacsbr: remove unused variables 2012-06-03 01:53:36 +02:00
Michael Niedermayer
0e3cec9f7d aacsbr: optimize sine level addition 
Based-on commit by Måns Rullgård <mans@mansr.com>

original:   1424 decicycles in phi, 1024 runs, 0 skips
mans code:  1104 decicycles in phi, 1024 runs, 0 skips
this change: 734 decicycles in phi, 1024 runs, 0 skips

mans code:   1 file changed, 20 insertions(+), 10 deletions(-)
this change: 1 file changed, 10 insertions(+), 6 deletions(-)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-03 01:53:10 +02:00
Michael Niedermayer
e95233789c mpc7: fix handling of last frame 
Fixes heap buffer overflow
Fixes ticket1393

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 23:43:31 +02:00
Michael Niedermayer
82570d2f09 png_parser: dont falsely mark frames as keyframes 
Fixes Ticket1381

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 21:12:20 +02:00
Michael Niedermayer
b3675f890a bink: fix out of reference frame read 
Fixes Ticket1374

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 19:56:10 +02:00
Michael Niedermayer
fb4e434cfb h264: log debug output for slightly truncated streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 15:37:20 +02:00
Michael Niedermayer
cd0f9f00a2 h264: try to better handle h264 streams that are slightly truncated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 15:36:50 +02:00
Michael Niedermayer
debbcfae60 bmv: fix apparent sign error in the frame_off check 
Fixes part of Ticket1373

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 04:18:13 +02:00
Michael Niedermayer
679c578cb8 bmv: fix integer overflows in vlc decoder. 
Fixes part of Ticket1373

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Based-on-patch-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 04:18:13 +02:00
Michael Niedermayer
9ebe6e3910 ffv1: fix integer overflow in quant table initialization 
Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 02:37:36 +02:00
Michael Niedermayer
97c281d5b7 ffv1: fix crash caused by version becoming inconsistent 
Fixes part of Ticket1372

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-02 02:30:55 +02:00
Michael Niedermayer
0bae6661cd fraps: fix version 0/1 input data size check. 
Fixes array overread.
Fixes Ticket1371

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 23:22:54 +02:00
Michael Niedermayer
f23a2418fb wmv1: check that the input buffer is large enough 
Fixes null ptr deref
Fixes Ticket1367

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 23:22:54 +02:00
Michael Niedermayer
0d83edaba9 dct-test: give emms a memory clober. 
Without this, the compiler in theory could attempt to keep
things in float registers across the emms which would cause
bad things to happen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 19:16:14 +02:00
Michael Niedermayer
461030a7ac dct-test: perform emms before gettime(). 
This fixes the hypothetical case of a gettime implementation using floats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 19:15:24 +02:00
Michael Niedermayer
0766b6e3ec rv20: fix lowres out of array read 
Fixes Ticket1239

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 17:07:07 +02:00
Michael Niedermayer
febc013dc5 yopdec: check frame oddness to be within supported limits 
Fixes Ticket1365

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 15:52:20 +02:00
Michael Niedermayer
b6fdf8dea7 yopdec: check that palette fits in the packet 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 15:51:50 +02:00
Michael Niedermayer
422418b664 dnxhd: replace asserts by av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 12:14:49 +02:00
Michael Niedermayer
03ce421c13 8svx: fix crash 
Fixes Ticket1377

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 02:32:00 +02:00
Piotr Bandurski
59352cc219 sgienc: add a limit for maximum supported resolution 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 01:14:49 +02:00
Michael Niedermayer
8a0efa9cc0 qdm2: fix incorrect error spam 
Fixes Ticket1375

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 00:35:06 +02:00
Michael Niedermayer
e47e23698b libmp3lame: add missing layout terminator 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-01 00:07:36 +02:00
Michael Niedermayer
7cb8663362 h264: Fail on DPC its not fully implemented 
Fixes part of Ticket1369

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 23:52:08 +02:00
Michael Niedermayer
5afdb3e6b1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines
  http: Pass the proper return code of net IO operations
  http: Add 'post_data', a new option which sets custom HTTP post data
  lavfi: amix: check active input count before calling request_samples
  vp8: move block coeff arithcoder on stack.
  mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.

Conflicts:
	libavformat/ac3dec.c
	libavformat/mp3dec.c
	tests/fate/ac3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 21:27:42 +02:00
Michael Niedermayer
b7d1488393 h264: move q0 scan tables into context 
This fixes out of global array reads.
The alternative solutions of checking the index or modifying the VLC tables
to prevent the index going outside are each about 1-2 cpu cyclces slower
per coded 4x4 block.
The alternative of padding the global tables directly is more ugly and
moving them to the context should benefit cache locality.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 20:25:23 +02:00
Michael Niedermayer
b02cc2ddc6 mpeg4videodec: Check that cplx_estimation_* fits in the available space 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 20:25:23 +02:00
Piotr Bandurski
e03ddbcd91 gifenc: support resolutions up to 65535x65535 
Maybe someone can add a check in the second gif encoder (rgb24), because I'm not sure where it should be added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 16:59:25 +02:00
Piotr Bandurski
d2581dcca6 mjpegenc: add a limit for maximum supported resolution 
jpeg does not allow more than 65000 pixels for width and height

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 16:57:47 +02:00