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>
12 years ago
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>
12 years ago
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>
12 years ago
Michael Niedermayer
e7f255d89b
Merge commit '95baf701db719ecad6b31000429e20eca2526ed6'
...
* commit '95baf701db719ecad6b31000429e20eca2526ed6':
svq1: deMpegEncContextize
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
Stefano Sabatini
43912625e0
lavfi/select: assign NAN to ignored values
...
Also log scene value. Improve debugging.
12 years ago
Stefano Sabatini
6ba1f28008
lavfi/select: add support to options
...
Add options introspection, and improve error feedback.
12 years ago
Stefano Sabatini
c214cd18e2
lavfi/select: in select_frame(), rename picref -> ref
...
The variable is now used also for audio frames.
12 years ago
Stefano Sabatini
e7a0b2e054
doc/filters: itemize select/aselect examples
...
Improve rendering.
12 years ago
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.
12 years ago
Stefano Sabatini
f5461face5
lavfi: add aselect audio variant of select
12 years ago
Stefano Sabatini
64c5fbd7de
lavfi/select: remove deprecated and unused poll_frame() callback
...
Simplify.
12 years ago
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
12 years ago
Nicolas George
26db6535fc
lavf/matroskaenc: use integers to for display size.
...
Avoid rounding differences between x86_32 and x86_64.
Fix trac ticket #1997 .
12 years ago
Ronald S. Bultje
140367aff9
x86inc: fix stack alignment on win64
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Michael Niedermayer
a01679586c
mpeg1video: fix regression with slices != threads
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
03df972016
mpeg1video: support multi threaded slice encoding.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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.
12 years ago
Martin Storsjö
29d2595ad7
rtpproto: Remove unused defines
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Michael Niedermayer
e69e780cde
ff_copy_buffer_ref: use the channel count
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
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.
12 years ago
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>
12 years ago
Michael Niedermayer
a0f659b275
oggspeexparse: fix array overread
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Martin Storsjö
f3f60dcbdd
rtpdec_mpeg4: Cosmetic cleanup
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Martin Storsjö
584a017925
rtpdec: Cosmetic cleanup of the header
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Martin Storsjö
abf74a1169
rtpdec: Get rid of a useless _s suffix on a struct name
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Martin Storsjö
7941159df6
rtpdec/enc: Remove outdated/useless/misleading comments
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
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>
12 years ago
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>
12 years ago
Martin Storsjö
81ef519252
rtpdec: Limit writing to the buffer size
...
This fixes potential buffer overwrites.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Martin Storsjö
48238fd00b
svq1: Fix building with -DDEBUG
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Michael Niedermayer
12fcc626d6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavr: fix segfault due to overlooked change needed in 14758e3
x86inc: support stack mem allocation and re-alignment in PROLOGUE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Ronald S. Bultje
ce58642ed0
x86inc: support stack mem allocation and re-alignment in PROLOGUE.
...
Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
82c0211213
Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'
...
* commit '14758e3211d34a97c42b07acae117ce5627d7f57':
lavr: temporarily store custom matrix in AVAudioResampleContext
lavr: clarify documentation for avresample_get/set_matrix()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8dbc384f15
Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'
...
* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
swfdec: cosmetics: fix indentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
d276f28b7d
swfdec: print warning when len is cliped
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Carl Eugen Hoyos
31f9cf38f0
Fix frame-rate documentation.
12 years ago
Anton Khirnov
c4182d72c9
svq1: return meaningful error codes.
12 years ago
Anton Khirnov
998fdcff41
lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
12 years ago
Anton Khirnov
84a0806680
svq1: unmacroify macros used only once.
12 years ago
Anton Khirnov
95baf701db
svq1: deMpegEncContextize
...
This decoder is quite simple and none of the MpegEncContext complexity
is actually needed.
12 years ago
Michael Niedermayer
be5389d585
Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'
...
* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
swfdec: do better validation of tag length
Make LOCAL_ALIGNED syntactically similar on all systems
Conflicts:
libavformat/swfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Justin Ruggles
42b5688d5e
lavr: fix segfault due to overlooked change needed in 14758e3
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Ronald S. Bultje
6f40e9f070
x86inc: support stack mem allocation and re-alignment in PROLOGUE
...
Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago