diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 00:58:17 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 01:04:49 +0400 |
| commit | 7c26761b8121ed362870b2e0eb06b85431bdd7a2 (patch) | |
| tree | 5e8bc55238ce090b34e5e8cd7777fc4dd5e7fb76 /libavfilter/video.h | |
| parent | 72dabdfc58064fcb249f26fc7afca2221f18a832 (diff) | |
| parent | fe1c1198e670242f3cf9e3e1eef27cff77f3ee23 (diff) | |
Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'
* commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23':
lavf: use dts difference instead of AVPacket.duration in find_stream_info()
avf: introduce nobuffer option
fate: make yadif tests consistent across systems
vf_hqdn3d: support 9 and 10bit colordepth
vf_hqdn3d: reduce intermediate precision
vf_hqdn3d: simplify and optimize
factor identical ff_inplace_start_frame out of two filters
vf_hqdn3d: cosmetics
avprobe/avconv: fix tentative declaration compile errors on MSVS.
Conflicts:
doc/APIchanges
ffmpeg.c
ffprobe.c
libavformat/avformat.h
libavformat/options_table.h
libavformat/utils.c
libavformat/version.h
tests/fate/filter.mak
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/video.h')
| -rw-r--r-- | libavfilter/video.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/video.h b/libavfilter/video.h index e30980ea88..c677f30047 100644 --- a/libavfilter/video.h +++ b/libavfilter/video.h @@ -42,6 +42,7 @@ AVFilterBufferRef *ff_null_get_video_buffer(AVFilterLink *link, int perms, int w AVFilterBufferRef *ff_get_video_buffer(AVFilterLink *link, int perms, int w, int h); +int ff_inplace_start_frame(AVFilterLink *link, AVFilterBufferRef *picref); int ff_null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref); int ff_null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir); int ff_null_end_frame(AVFilterLink *link); |