RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
40,080 Commits 36 Branches 398 Tags 233 MiB
Commit Graph

40080 Commits

Author SHA1 Message Date
Michael Niedermayer 068d0b4e25 h264: some fields in SEIs are longer than 25 bits thus use get_bits_long() 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-23 19:41:46 +02:00
Nicolas George 1e43786b4c print_options: warn that the files are generated. 2012-04-23 18:14:25 +02:00
Nicolas George 9b84f8a987 parseutils: add av_parse_time() test. 2012-04-23 14:39:01 +02:00
Nicolas George 43b7068070 parseutils: make av_parse_time() check for failure. 
Until now, av_parse_time() would accept "1:00" as "1"
and silently ignore ":00".

This patch also includes a few cosmetic changes.
 2012-04-23 14:39:01 +02:00
Nicolas George 9246896f77 parseutils: add FATE test. 2012-04-23 14:39:01 +02:00
Nicolas George 99f29108d3 ffmpeg: directly request frames from filters. 
It allows ffmpeg filtering logic to work with filters
that do not implement the poll_frame method,
such as split or tile.
 2012-04-23 14:14:25 +02:00
Nicolas George e11110dee4 buffersink: add AV_BUFFERSINK_FLAG_NO_REQUEST. 2012-04-23 14:13:59 +02:00
Nicolas George 2d6522bab0 vsrc_buffer: count the number of failed requests. 2012-04-23 14:13:40 +02:00
Nicolas George f75ee4031e vsrc_buffer: return EAGAIN if no frame is available. 
This is not an erroneous condition, do not print a warning.
 2012-04-23 14:13:40 +02:00
Nicolas George 2ce7972779 avfiltergraph: add avfilter_graph_request_oldest(). 
Keep a heap of all sink links ordered by timestamps.
 2012-04-23 14:13:40 +02:00
Nicolas George e0761feec4 avfilter: add a pointer from links to graph. 2012-04-23 14:13:40 +02:00
Nicolas George 78ac49c233 avfilter: document request_frame return codes. 2012-04-23 14:13:40 +02:00
Nicolas George 73bc019baf lavf: print a warning if probesize seems not enough. 2012-04-23 12:26:19 +02:00
Michael Niedermayer 4d87001096 vp8: fix crash due to skiped update_dimensions(). 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-23 10:47:33 +02:00
Michael Niedermayer 70d54392f5 lowres2 support. 
The new lowres support is limited to decoders where lowres decoding
is possible in high quality.
I was not able to measure any speed difference, but if one is found
the 2-3 lines that might affect speed can be made compile time conditional

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 22:26:55 +02:00
Michael Niedermayer 92ef4be4ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: allow runtime masking of CPU features
  dsputil: remove unused functions
  mov: Treat keyframe indexes as 1-origin if starting at non-zero.
  mov: Take stps entries into consideration also about key_off.
  Remove lowres video decoding

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/libopenjpegdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegvideo.c
	libavcodec/utils.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 22:26:42 +02:00
Carl Eugen Hoyos 2e07f42957 Support flicvideo with 904 bytes extradata. 
Fixes ticket #1234.
 2012-04-22 22:07:02 +02:00
Michael Niedermayer 2ea5f866e6 ffmpeg: assert the refcount of decoded frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 20:10:00 +02:00
Michael Niedermayer 22a6a23a45 ffmpeg: assert the refcount of allocated frames, 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 20:08:56 +02:00
Michael Niedermayer cf09496cf9 ffmpeg: assert against creation of cycles in the pools linked list. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 20:07:04 +02:00
Michael Niedermayer be2b927a6f ffmpeg: stricter refcount check in unref_buffer() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 20:05:58 +02:00
Michael Niedermayer 951cbea56f mpeg12dec: reset data size after parsing extradata. 
This ended up corrupting data structures and may possibly
lead to a double free.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 20:03:53 +02:00
Michael Niedermayer 41abc9da50 iff: fix null ptr dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 17:27:54 +02:00
Michael Niedermayer 52fdaf27f7 audemux: Fix potential integer overflow leading to a division by 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 15:34:21 +02:00
Michael Niedermayer 8aa57b7b5e audemux: Check channels isnt 0 
Fixes a division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 15:34:15 +02:00
Michael Niedermayer fd2127ad53 wtvdec: Check that stream private context has been allocated before use. 
This fixes a null ptr dereference with attachments

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 15:29:34 +02:00
Michael Niedermayer 9a4f5b7616 mjpegbdec: check SOS/SOF ordering. 
Fixes null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 14:58:28 +02:00
Michael Niedermayer abec6549ae ffv1dec: Require a valid keyframe for decoding non keyframes. 
Before this the context could become inconsistent, this lead to a null ptr
dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 14:58:28 +02:00
Mans Rullgard d526c5338d ARM: allow runtime masking of CPU features 
This allows masking CPU features with the -cpuflags avconv option
which is useful for testing different optimisations without rebuilding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-22 12:30:45 +01:00
Nicolas George 23a6e4749f ffmpeg: fix validity test for file index. 
Also fix a typo in the next line.
 2012-04-22 12:45:35 +02:00
Michael Niedermayer 605f2b6b00 asv1dec: check extradatasize before reading. 
Fixes null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 12:16:29 +02:00
Michael Niedermayer fa5dacce14 indeo5: check against scaleable frames in non scaleable streams. 
Fixes a null ptr dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 12:09:59 +02:00
Michael Niedermayer 2a59abf1a8 smackerdemux: Allocate padding for extradata 
Fixes slight overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 11:23:58 +02:00
Michael Niedermayer f7c67536fe svq1dec: Fix overread on very small input 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 11:10:17 +02:00
Michael Niedermayer b21ba20cc8 wmaprodec: tighter check for num_vec_coeffs 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 03:49:13 +02:00
Michael Niedermayer c047afb80c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: remove AVCodecContext.dsp_mask
  avconv: fix a segfault when default encoder for a format doesn't exist.
  utvideo: general cosmetics
  aac: Handle HE-AACv2 when sniffing a channel order.
  movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0.
  xxan: Remove write-only variable in xan_decode_frame_type0().
  ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().

Conflicts:
	ffmpeg.c
	libavcodec/utvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 22:56:07 +02:00
Carl Eugen Hoyos 2f06b56382 Support broken v210 files with 64 byte padding. 
Fixes ticket #743.

Reviewed-by: Paul B Mahol
 2012-04-21 22:31:11 +02:00
Michael Niedermayer 6c0027bb39 dnxhddec: check that the indicated bit depth matches the tables. 
Fixes crash

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 21:39:18 +02:00
Michael Niedermayer 8c59e0c362 xldec: move buffer size check up, it can be done before allocating a frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 21:31:25 +02:00
Michael Niedermayer 94b42da696 xldec: Check that width is a multiple of 4 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 21:30:23 +02:00
Mans Rullgard d7458bc8c6 dsputil: remove unused functions 
These functions were left unused by the lowres removal.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-21 20:00:39 +01:00
Yusuke Nakamura 94c9bf8887 mov: Treat keyframe indexes as 1-origin if starting at non-zero. 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-04-21 14:04:33 -04:00
Yusuke Nakamura ba9869311f mov: Take stps entries into consideration also about key_off. 
Splitted files don't start always from a sync sample.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-04-21 14:04:33 -04:00
Mans Rullgard 2bcbd98459 Remove lowres video decoding 
This feature is complex, of questionable utility, and slows down
normal decoding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-21 18:56:19 +01:00
Michael Niedermayer 80d51680b2 xmvdemux: prefer av_freep() to deallocate audio stream structs. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 19:42:44 +02:00
Michael Niedermayer 13381577d1 xmvdemux: dont let current_stream become invalid. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 19:41:54 +02:00
Mans Rullgard 95510be8c3 avcodec: remove AVCodecContext.dsp_mask 
This removes all references to AVCodecContext.dsp_mask and marks
it for eviction at the next version bump.  It has been superseded
by av_set_cpu_flag_mask() which, unlike this field, works everywhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-21 18:30:01 +01:00
Michael Niedermayer 5a35bd92ad cook: check subacket count 
Fixes out of array writes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 19:28:35 +02:00
Jakub Stachowski 93bf1aac6a wmalossless: Ensure that last frame is not written again if nothing was decoded in current packet. 
Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-21 19:05:16 +02:00
Nicolas George b27383e453 ffprobe: do not try to decode empty packets. 
Fixes sporadic decode failures and trac ticket #997.
 2012-04-21 14:02:08 +02:00