virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
49,303 Commits 37 Branches 400 Tags 463 MiB
c8f25cafd2
Commit Graph

49303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c8f25cafd2 atrac3: fix buffer size for get_bits. 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 04:27:53 +01:00
Michael Niedermayer
66daebc9d5 indeo4: check for invalid transform_size blk_size combinations 
The checks existing previously where not sufficient
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 03:18:49 +01:00
Michael Niedermayer
cfc7b9cfff 4xm: remove avcodec_get_frame_defaults() calls 
They are not needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 02:27:19 +01:00
Michael Niedermayer
d73b65ed0e 4xm: add assert to check that the pointer from read_huffman_tables is within the array 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 02:27:19 +01:00
Michael Niedermayer
53a3fdbfc5 4xm: Check available space in read_huffman_tables() 
Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 02:27:19 +01:00
Michael Karcher
dcbb920f15 Fix atrac3 decoder broken in e55d53905f 
Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 00:05:57 +01:00
Michael Niedermayer
c6ef7641fc ffv1enc: fix gbrp>8bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 23:34:36 +01:00
Stefano Sabatini
e80be5a0aa lavfi/showwaves: fail in case of push_frame() error 2013-01-25 19:35:21 +01:00
Stefano Sabatini
e4e36a4dd2 doc/filters: apply minor fixes 2013-01-25 17:45:27 +01:00
Stefano Sabatini
b7d34b328b lavfi/showwaves: add display mode option and mode=line 2013-01-25 17:42:04 +01:00
Michael Niedermayer
13aca070ab gifdec: resync support 
This allows decoding gifs that have junk at the begin
and also allows byte wise seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 17:25:16 +01:00
Matthieu Bouron
40b4468f62 lavc/dnxhddata: fix bitrates for cid 1251 and 1252 in cid table 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 17:09:59 +01:00
Michael Niedermayer
495cb44172 setpts: deprecate RTCTIME, we have time(0) which is more generic 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 15:14:33 +01:00
Michael Niedermayer
fc2922836b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avfilter: allow setpts filter to use wallclock time for calculations

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 15:04:41 +01:00
Michael Niedermayer
25be63005f Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b' 
* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
  lavu: Add av_strnstr()
  h264: Allow discarding the cropping information from SPS

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 14:36:45 +01:00
Michael Niedermayer
b2d0c5bd13 Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e' 
* commit '33552a5f7b6ec7057516f487b1a902331f8c353e':
  arm: Add mathops.h to ARCH_HEADERS list
  avstring: K&R formatting cosmetics

Conflicts:
	libavutil/avstring.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 14:24:38 +01:00
Michael Niedermayer
e9125dd556 Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339' 
* commit '2c10e2a2f62477efaef5b641974594f7df4ca339':
  build: Make the H.264 parser select h264qpel
  x86: h264qpel: add cpu flag checks for init function

Conflicts:
	libavcodec/x86/h264_qpel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 14:14:21 +01:00
Paul B Mahol
d07b0d9927 swscale: check flags instead of nb_components to find if pixel format have alpha 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-25 13:06:00 +00:00
Paul B Mahol
7003d650b0 lavc/gifdec: remove obsolete check 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-25 12:54:15 +00:00
Paul B Mahol
51c7af9d32 lavc/gifdec: move idx_line allocation out of gif_read_header1() 
Now allocation is done only if av_image_check_size() passes.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-25 12:54:15 +00:00
Paul B Mahol
285128eedf lavc/gifdec: do not return nonzero *got_frame if frame is not passed 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-25 12:54:14 +00:00
Paul B Mahol
aaebdce3d9 lavc/gifdec: simplify "!= 0" checks 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-25 12:54:14 +00:00
Paul B Mahol
f1412c7997 lavc/gifdec: use memcpy() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-25 12:54:14 +00:00
Michael Niedermayer
91ae9bc51e Merge commit '6bdb841b46d170d58488deaed720729b79223b1d' 
* commit '6bdb841b46d170d58488deaed720729b79223b1d':
  arm: h264qpel: use neon h264 qpel functions only if supported

* bug was fixed previously (in merge of buggy code):
  h264: copy h264qpel dsp context to slice thread copies

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 13:45:22 +01:00
Vladimir Pantelic
0b55b16abc avfilter: allow setpts filter to use wallclock time for calculations 
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-25 10:50:09 +01:00
Vladimir Pantelic
b85a5e87af lavu: Add av_strnstr() 
This is a length limited version of strstr()

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-25 10:47:51 +01:00
Vittorio Giovara
a84fb6e06f h264: Allow discarding the cropping information from SPS 
Some 3D systems overload the meaning of the field for other purposes.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-25 07:50:35 +01:00
Michael Niedermayer
ab6c9332bf vqavideo: check chunk sizes before reading chunks 
Fixes out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 06:12:56 +01:00
Michael Niedermayer
e9d443cf08 eacmv: Free frames on resolution changes 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 03:30:04 +01:00
Michael Niedermayer
286930d302 gifdec: check that w,h is not zero 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-25 03:30:04 +01:00
Carl Eugen Hoyos
a0d1440476 Fix compilation with --disable-everything on x86_32. 
Fixes ticket #2183.
 2013-01-25 03:04:46 +01:00
Stefano Sabatini
c4738c3196 ffmpeg: fix typo in open_files() message 
Found-By: Justin Ruggles
 2013-01-25 00:46:41 +01:00
Stefano Sabatini
1ec3324f00 lavf/img2enc: extend current options documentation 2013-01-25 00:04:23 +01:00
Stefano Sabatini
069d156454 lavf/img2dec: fix option help fields 2013-01-25 00:04:22 +01:00
Stefano Sabatini
2756c3091a doc/faq: fill missing word in the concat protocol entry 2013-01-25 00:04:22 +01:00
Stefano Sabatini
40cb682ca0 doc/faq: mention concat protocol documentation in the protocol concatenation entry 2013-01-25 00:04:22 +01:00
Michael Niedermayer
c10350358d gifdec: gif_copy_img_rect: Fix end pointer 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 23:11:44 +01:00
Michael Niedermayer
fc8e8e5bef h264_qpel: put cpuflags checks back. 
These where lost when libav moved the code out of dsputil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 22:14:39 +01:00
Michael Niedermayer
cf48b00640 cavsdec: check for value in get_ue_code() 
Fixes integer overflow and prints an error in case the value is
invalid.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 21:55:12 +01:00
Jason
77b740ac0a lavu/timecode: fix time code calculation for 60000/1001 drop frame 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 21:06:24 +01:00
Jason
a717fa84ed lavu/timecode: Allow drop frame mode for 60000/1001 fps 
Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 21:06:24 +01:00
Diego Biurrun
33552a5f7b arm: Add mathops.h to ARCH_HEADERS list 
It is an arch-specific header not suitable for standalone compilation.
 2013-01-24 20:59:22 +01:00
Luca Barbato
4333df6355 avstring: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-24 20:49:54 +01:00
Diego Biurrun
2c10e2a2f6 build: Make the H.264 parser select h264qpel 
It is required for building the shared H.264 code.
 2013-01-24 19:25:21 +01:00
Janne Grunau
c5c2060cf5 x86: h264qpel: add cpu flag checks for init function 
The code was copied from per cpu extension init function so the checks
for supported extensions was overlooked.
 2013-01-24 19:03:59 +01:00
Michael Niedermayer
55d66b2790 movenc: check that fps for tmcd is within encodable range. 
The fps is stored as a 8 bit value thus 255 is the maximum encodable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:59:49 +01:00
Michael Niedermayer
9362f31b55 movenc: Calculate fps for tmcd without intermediate step. 
Fixes part of Ticket2045

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:57:12 +01:00
Michael Niedermayer
bee044d7c2 ffmpeg: copy tmcd track timebase parameters 
Fixes part of Ticket2045

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:37:32 +01:00
Michael Niedermayer
b75ac7c71c lavc: include timebase in avcodec string at debug level. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 18:35:07 +01:00
Michael Niedermayer
c071b00643 mpeg12demux: Fallback to startcode for stream type identification. 
Fixes Ticket2147
Fixes SageTV support

Based-on patch by Andrew Gallatin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 17:10:23 +01:00