be26232efa
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
...
* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: make some functions and tables static.
asyncts: ignore min_delta only if first_pts is set
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:56:56 +01:00
a01fe55077
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
...
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
asyncts: merge two conditions
x86inc: fully concatenate tokens to fix macro expansion for nasm
h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:43:46 +01:00
b9d887c225
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
...
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 15:17:51 +01:00
b6e7041f90
Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
...
* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
doc: improve documentation for the asyncts filter first_pts option
asyncts: fix the asyncts behavior when using the first_pts option
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 13:58:12 +01:00
593f5c0f3c
Merge commit '8083332c2de9ee189f96844ff4c2d9be1844116f'
...
* commit '8083332c2de9ee189f96844ff4c2d9be1844116f':
asyncts: use clipped delta value when setting resample compensation
asyncts: fix flushing of final samples at EOF
vp6: properly fail on unsupported feature
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-14 13:51:20 +01:00
c0dc57f126
asyncts: merge two conditions
2012-12-13 18:51:56 -05:00
4e5a8878d5
asyncts: ignore min_delta only if first_pts is set
2012-12-13 18:51:56 -05:00
8083332c2d
asyncts: use clipped delta value when setting resample compensation
...
The max_comp option is supposed to limit maximum compensation, but
currently the clipped value is not actually used.
2012-12-13 13:02:21 -05:00
0ee440fe38
asyncts: cosmetics: reindent
2012-12-13 13:02:21 -05:00
c143de40c3
asyncts: fix the asyncts behavior when using the first_pts option
...
Currently it will do padding, but it does not properly handle
start-of-stream trimming as documented.
2012-12-13 13:02:21 -05:00
f266486b2e
asyncts: fix flushing of final samples at EOF
2012-12-13 13:02:21 -05:00
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
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
43912625e0
lavfi/select: assign NAN to ignored values
...
Also log scene value. Improve debugging.
2012-12-13 00:18:49 +01:00
6ba1f28008
lavfi/select: add support to options
...
Add options introspection, and improve error feedback.
2012-12-13 00:16:30 +01:00
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
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
f5461face5
lavfi: add aselect audio variant of select
2012-12-13 00:10:24 +01:00
64c5fbd7de
lavfi/select: remove deprecated and unused poll_frame() callback
...
Simplify.
2012-12-13 00:03:50 +01:00
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
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
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
9138f6da4a
lavfi/showinfo: check plane count before dereferencing.
2012-12-12 02:55:10 +01:00
4b4f16cdc0
lavfi/fps: remove parse opt error message.
...
See cc650cf0
2012-12-11 18:14:08 +01:00
0e0e3db189
lavfi/fps: add shorthand.
2012-12-11 18:12:11 +01:00
fd3cdcaf5f
lavfi: remove mp=denoise3d filter.
...
hqdn3d was meant to be a more efficient denoise3d filter, is supported
natively, and is faster on my computer thanks to the ASM optimisations.
2012-12-11 04:28:08 +01:00
18d9398143
doxy: add ref for lavfi, lpp and lsws.
2012-12-11 02:13:43 +01:00
b11a889055
vf_tinterlace: default of mode switch is impossible, add assert.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-11 00:03:23 +01:00
642a60f1c2
lavfi/setfield: add support to named options and introspection
2012-12-08 18:26:32 +01:00
7f154bd54f
lavfi/setfield: switch to filter_frame API
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-08 17:19:17 +01:00
4cd40ef343
lavfi/idet: switch to filter_frame API
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-12-08 17:19:17 +01:00
5825e9425b
lavfi/version: remove unused dropped symbol
2012-12-08 16:04:09 +01:00
10db70d5e9
lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c
...
Justin's version has more features but is otherwise equivalent from the
point of view of the syntax.
2012-12-08 15:40:07 +01:00
769546631c
lavfi/volume_justin: add support to option shorthands and introspection
2012-12-08 15:22:55 +01:00
402ac72bbc
lavfi/volume_justin: fix a few grammar inconsistencies in options description
2012-12-08 15:22:55 +01:00
35e81441fc
lavfi/sendcmd: switch to filter_frame API
2012-12-08 12:10:40 +01:00
3eae531de2
lavfi/swapuv: switch to filter_frame API
2012-12-08 12:10:34 +01:00
fe508f807a
lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()
...
Improve consistency/readability.
2012-12-07 19:45:34 +01:00
0bc0d31b7b
lavfi/alphaextract: access outlink properties rather than out_buf->video
...
Avoid one dereference, simplify.
2012-12-07 19:45:27 +01:00
130c6497d2
lavfi/alphaextract: fix assignment of invalid size value to memcpy in case linesize < 0
...
Fix crash, for example in the command:
ffmpeg -f image2 -vcodec pgmyuv -i tests/vsynth1/%02d.pgm \
-vf "[in]format=yuv420p,split,alphamerge,split[o3][o4];
[o4]vflip,alphaextract[alpha];[o3][alpha]alphamerge[out]" \
-vcodec rawvideo -f nut md5:
2012-12-07 19:43:19 +01:00
c3ad91a3d7
lavfi/alphaextract: switch to filter_frame() API
2012-12-07 19:42:59 +01:00
1f467220cf
lavfi/alphaextract: drop cur_linesize = out_linesize branch in draw_slice()
...
The code causes uninitialized data copy, and may be actually slower than
a loop over each line in case the padding is big.
2012-12-07 19:09:47 +01:00
24b20087bd
Fix compilation with yasm 0.6.2.
2012-12-07 00:26:45 +01:00
da9a45b681
lavfi/tinterlace: drop redundant NULL checks in uninit()
2012-12-06 22:32:03 +01:00
c6a216771f
lavfi/tinterlace: add support to option parsing
...
Simplify code, and provide introspection through the AVOption system.
2012-12-06 22:31:42 +01:00
fef7b2e0be
lavfi/tinterlace: switch to filter_frame API
...
Also add missing NULL checks.
2012-12-06 22:30:59 +01:00
bbd44f6ca4
lavfi/mp: switch to ff_filter_frame.
2012-12-06 21:11:28 +01:00
eaa47e7454
lavfi/deshake: small align prettifying.
2012-12-06 16:20:31 +01:00
03778575b9
lavfi/deshake: switch inverted comments.
2012-12-06 16:20:31 +01:00
0678641b7c
lavfi/deshake: remove unecessary check before unref.
2012-12-06 16:20:31 +01:00
Michael Niedermayer
Justin Ruggles
Stefano Sabatini
Clément Bœsch
Matthieu Bouron
Carl Eugen Hoyos