diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-24 03:45:02 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-24 03:45:02 +0400 |
commit | bba6f5b77f69e0b7fb00b3f346422715fc602f55 (patch) | |
tree | 3b1a17486c377e86daf4141e7900676fe6461332 /libavfilter | |
parent | ad9e0ed170234bc6c5660f96752777965081163e (diff) | |
parent | 8b94df0f2047e9728cb872adc9e64557b7a5152f (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp3dec: Check coefficient index in vp3_dequant()
svq1dec: call avcodec_set_dimensions() after dimensions changed.
Prepare for 0.8_beta1 snapshot release
threads: check defines before using them in automatic thread detection
pthread: include sys/types.h before sys/sysctl.h
4xm: remove unused variables.
h264: Fix a possible overread in decode_nal_units()
allfilters: fix type of avfilter_vsrc_buffer.
w32thread: call ResetEvent() in pthread_cond_broadcast().
Conflicts:
Changelog
RELEASE
doc/RELEASE_NOTES
libavcodec/pthread.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/allfilters.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 77a8a484d5..0b641c7126 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -110,7 +110,7 @@ void avfilter_register_all(void) /* vsrc_buffer is a part of public API => registered unconditionally */ { - extern avfilter_vsrc_buffer; + extern AVFilter avfilter_vsrc_buffer; avfilter_register(&avfilter_vsrc_buffer); } } |