generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,066 Commits 24 Branches 241 Tags 173 MiB
63753186cc
Commit Graph

48066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ruggles
f266486b2e asyncts: fix flushing of final samples at EOF 2012-12-13 13:02:21 -05:00
Michael Niedermayer
616e6ffac6 aresample: increase n_out buffer size a bit to reduce delay in some corner cases 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 18:17:48 +01:00
Michael Niedermayer
7726916c14 mpegts: check av_new_stream() return value. 
Fixes CID703728
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 17:46:17 +01:00
Luca Barbato
be75fed975 vp6: properly fail on unsupported feature 
Interlacing is not supported at all and mismanaged down the normal
codepaths causing possible buffer management issues.

CC: libav-stable@libav.org
 2012-12-13 17:05:45 +01:00
Michael Niedermayer
0ea4742341 qt-faststart: Check offset_count 
Fixes CID733836
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 15:07:20 +01:00
Michael Niedermayer
eee8c94f50 cavsdec: check ff_get_buffer() return value 
Fixes CID747721
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 14:32:58 +01:00
Michael Niedermayer
5cb080fa5e snowenc: check ff_get_buffer() return value 
Fixes CID747722
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 14:26:03 +01:00
Michael Niedermayer
7effc26ba7 svq1enc: check ff_get_buffer() return value 
Fixes CID747723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 14:20:24 +01:00
Michael Niedermayer
1818a1130d alsdec: propagate error codes in read_block() 
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 13:59:15 +01:00
Michael Niedermayer
0213d5ad86 alsdec: make return checking for read_*_block_data() consistent 
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 13:59:11 +01:00
Michael Niedermayer
79bfba14b7 alsdec: Use AVERROR_INVALIDDATA in read_const_block_data 
Reviewed-by: Thilo Borgmann <thilo.borgmann@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 13:58:52 +01:00
Nedeljko Babic
d7117138cf mips: ac3 downmix updated to the new data layout. 
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 13:51:05 +01:00
Nicolas George
2dbc84b1a8 lavf/matroskaenc: check for overflow in display width. 2012-12-13 12:45:07 +01:00
Michael Niedermayer
7897919a88 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:23:48 +01:00
Michael Niedermayer
2e5e2bf935 Merge commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667' 
* commit 'f3f60dcbdd6ff2201526a603fe28293975bb7667':
  rtpdec_mpeg4: Cosmetic cleanup
  rtpdec: Cosmetic cleanup of the header
  rtpdec: Get rid of a useless _s suffix on a struct name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:18:12 +01:00
Michael Niedermayer
de7c95d551 Merge commit '7941159df6aad2d219e2a7184489be7a735dd944' 
* commit '7941159df6aad2d219e2a7184489be7a735dd944':
  rtpdec/enc: Remove outdated/useless/misleading comments
  rtpdec: Improve some comments
  rtpdec: Remove unused context variables
  rtpdec: Limit writing to the buffer size
  svq1: Fix building with -DDEBUG
  svq1: return meaningful error codes.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 12:06:19 +01:00
Michael Niedermayer
9c0ec23c7d Merge commit '998fdcff41bbda8ef13c991743376556f910efa9' 
* commit '998fdcff41bbda8ef13c991743376556f910efa9':
  lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
  svq1: unmacroify macros used only once.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 11:53:15 +01:00
Michael Niedermayer
e7f255d89b Merge commit '95baf701db719ecad6b31000429e20eca2526ed6' 
* commit '95baf701db719ecad6b31000429e20eca2526ed6':
  svq1: deMpegEncContextize

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 11:49:12 +01:00
Michael Niedermayer
db6e960450 lavfi: drop ff_null_start_frame/end_frame/draw_slice. 
The functions have become unused

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-13 03:38:16 +01:00
Stefano Sabatini
43912625e0 lavfi/select: assign NAN to ignored values 
Also log scene value. Improve debugging.
 2012-12-13 00:18:49 +01:00
Stefano Sabatini
6ba1f28008 lavfi/select: add support to options 
Add options introspection, and improve error feedback.
 2012-12-13 00:16:30 +01:00
Stefano Sabatini
c214cd18e2 lavfi/select: in select_frame(), rename picref -> ref 
The variable is now used also for audio frames.
 2012-12-13 00:12:55 +01:00
Stefano Sabatini
e7a0b2e054 doc/filters: itemize select/aselect examples 
Improve rendering.
 2012-12-13 00:11:20 +01:00
Stefano Sabatini
c51f090ff9 lavfi: mv vf_select.c -> f_select.c 
The file now contains also an audio select implementation. Also move the
aselect/select documentation from video filters to the multimedia filters
section.
 2012-12-13 00:10:43 +01:00
Stefano Sabatini
f5461face5 lavfi: add aselect audio variant of select 2012-12-13 00:10:24 +01:00
Stefano Sabatini
64c5fbd7de lavfi/select: remove deprecated and unused poll_frame() callback 
Simplify.
 2012-12-13 00:03:50 +01:00
Alex Converse
6d5b009267 aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN. 
Found-by: pawlkt
CC: libav-stable@libav.org
 2012-12-12 13:22:10 -08:00
Nicolas George
26db6535fc lavf/matroskaenc: use integers to for display size. 
Avoid rounding differences between x86_32 and x86_64.
Fix trac ticket #1997.
 2012-12-12 20:59:34 +01:00
Ronald S. Bultje
140367aff9 x86inc: fix stack alignment on win64 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 21:30:49 +02:00
Michael Niedermayer
a01679586c mpeg1video: fix regression with slices != threads 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 20:12:11 +01:00
Michael Niedermayer
03df972016 mpeg1video: support multi threaded slice encoding. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 19:29:32 +01:00
Michael Niedermayer
f18c873ab5 adpcm: fix off by 1 error and out of array access in DK4 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 17:46:05 +01:00
Michael Niedermayer
03b9d4a7dc msmpeg4dec: fix coeff index 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 17:46:05 +01:00
Michael Niedermayer
028cc42a16 read_gab2_sub: fix null pointer dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 17:46:05 +01:00
Michael Niedermayer
02b238186a avfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if they are set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 17:46:05 +01:00
Nicolas George
0f236345fb ffmpeg: sub2video: use start and end time. 
Until now, the end_display_time was ignored, making single
packets subtitles (like dvdsub) stay indefinitely.

start_display_time was also ignored, but is it almost always 0.
 2012-12-12 15:05:50 +01:00
Martin Storsjö
29d2595ad7 rtpproto: Remove unused defines 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 16:01:24 +02:00
Michael Niedermayer
e69e780cde ff_copy_buffer_ref: use the channel count 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 14:12:47 +01:00
Michael Niedermayer
5a4eb6aa27 avfilter_get_video_buffer_ref_from_frame: check channel count 
more than 8 channels is not supported and crashes with null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 14:12:47 +01:00
Michael Niedermayer
0ceca269b6 alsdec: check block length 
Fix writing over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 14:12:47 +01:00
Nicolas George
16c3cb9bbf lavf/concatdec: avoid leaking URLs. 
Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.
 2012-12-12 12:15:57 +01:00
Michael Niedermayer
75b3911e5a mxf_set_audio_pts: fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:35:47 +01:00
Michael Niedermayer
a0f659b275 oggspeexparse: fix array overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-12 11:21:23 +01:00
Martin Storsjö
f3f60dcbdd rtpdec_mpeg4: Cosmetic cleanup 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:50 +02:00
Martin Storsjö
584a017925 rtpdec: Cosmetic cleanup of the header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:44 +02:00
Martin Storsjö
abf74a1169 rtpdec: Get rid of a useless _s suffix on a struct name 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:38 +02:00
Martin Storsjö
7941159df6 rtpdec/enc: Remove outdated/useless/misleading comments 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:33 +02:00
Martin Storsjö
d6ec745246 rtpdec: Improve some comments 
The previous comment about the buffer was wildly inaccurate and
misleading.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:28 +02:00
Martin Storsjö
e66d448c75 rtpdec: Remove unused context variables 
These stem from back when both the rtp muxer and rtp depacketizing
shared the same struct.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:22 +02:00
Martin Storsjö
81ef519252 rtpdec: Limit writing to the buffer size 
This fixes potential buffer overwrites.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-12-12 12:18:16 +02:00