January 2015 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/utils: remove unneeded #include, there are no assert() only av_assert*
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 11:17:50 2015 +0000| [43630c82f1b0a774ba33b07e7723791520828f1d] | committer: Paul B Mahol avformat/utils: remove unneeded #include, there are no assert() only av_assert* Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43630c82f1b0a774b… --- libavformat/utils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index f6df49b..81c7a0d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#undef NDEBUG -#include <assert.h> #include <stdarg.h> #include <stdint.h>

1 0

avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert*
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 10:52:19 2015 +0000| [bc74f946bc9499c9eec52e54ee7a6c887ff54003] | committer: Paul B Mahol avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert* Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc74f946bc9499c9e… --- libavcodec/vc1.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index b3955f2..19657ed 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -37,9 +37,6 @@ #include "unary.h" #include "simple_idct.h" -#undef NDEBUG -#include <assert.h> - /***********************************************************************/ /** * @name VC-1 Bitplane decoding

1 0

avcodec/svq1dec: remove unneeded #include, there are no assert()
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 10:51:10 2015 +0000| [335c150ba1d22786aa8d6e1a26192d75108d63e5] | committer: Paul B Mahol avcodec/svq1dec: remove unneeded #include, there are no assert() Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=335c150ba1d22786a… --- libavcodec/svq1dec.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 2f9ea16..7c31e57 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -40,9 +40,6 @@ #include "mathops.h" #include "svq1.h" -#undef NDEBUG -#include <assert.h> - static VLC svq1_block_type; static VLC svq1_motion_component; static VLC svq1_intra_multistage[6];

1 0

avcodec/h261enc: fix dquant encoding
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jan 31 04:57:50 2015 +0100| [9f73b88c624a0b70a3d1169b9f6fa49002dfb94a] | committer: Michael Niedermayer avcodec/h261enc: fix dquant encoding Fixes Ticket4111 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f73b88c624a0b70a… --- libavcodec/h261enc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 75211a0..d7b56a8 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -250,12 +250,13 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], /* mvd indicates if this block is motion compensated */ mvd = motion_x | motion_y; - if ((cbp | mvd | s->dquant) == 0) { + if ((cbp | mvd) == 0) { /* skip macroblock */ s->skip_count++; s->mb_skip_run++; s->last_mv[0][0][0] = 0; s->last_mv[0][0][1] = 0; + s->qscale -= s->dquant; return; } } @@ -274,13 +275,15 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], h->mtype += 3; if (s->loop_filter) h->mtype += 3; - if (cbp || s->dquant) + if (cbp) h->mtype++; av_assert1(h->mtype > 1); } - if (s->dquant) + if (s->dquant && cbp) { h->mtype++; + } else + s->qscale -= s->dquant; put_bits(&s->pb, ff_h261_mtype_bits[h->mtype],

1 0

libavcodec/h264: replace assert() by av_assert0()
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jan 31 02:37:19 2015 +0100| [f5722ba276e524a48973d9db63b80a3dcc206ce4] | committer: Michael Niedermayer libavcodec/h264: replace assert() by av_assert0() also remove the now unneeded #include <assert.h> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5722ba276e524a48… --- libavcodec/h264.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 35261d8..4b01dcc 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -51,8 +51,6 @@ #include "thread.h" #include "vdpau_internal.h" -#include <assert.h> - const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 }; int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx) @@ -1891,7 +1889,7 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data, } } - assert(pict->buf[0] || !*got_frame); + av_assert0(pict->buf[0] || !*got_frame); ff_h264_unref_picture(h, &h->last_pic_for_ec);

1 0

avcodec/ratecontrol: replace asserts by av_asserts
by git＠videolan.org 31 Jan '15

31 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jan 31 01:48:21 2015 +0100| [be2ebc723d1ff2d6c87282c22b0ad38343b4db98] | committer: Michael Niedermayer avcodec/ratecontrol: replace asserts by av_asserts Also remove the now unneeded #include <assert.h> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be2ebc723d1ff2d6c… --- libavcodec/ratecontrol.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index b83af59..32a4de9 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -32,9 +32,6 @@ #include "mpegvideo.h" #include "libavutil/eval.h" -#undef NDEBUG // Always check asserts, the speed effect is far too small to disable them. -#include <assert.h> - #ifndef M_E #define M_E 2.718281828 #endif @@ -205,8 +202,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s) } e = sscanf(p, " in:%d ", &picture_number); - assert(picture_number >= 0); - assert(picture_number < rcc->num_entries); + av_assert0(picture_number >= 0); + av_assert0(picture_number < rcc->num_entries); rce = &rcc->entry[picture_number]; e += sscanf(p, " in:%*d out:%*d type:%d q:%f itex:%d ptex:%d mv:%d misc:%d fcode:%d bcode:%d mc-var:%"SCNd64" var:%"SCNd64" icount:%d skipcount:%d hbits:%d", @@ -482,7 +479,7 @@ static void get_qminmax(int *qmin_ret, int *qmax_ret, MpegEncContext *s, int pic int qmin = s->lmin; int qmax = s->lmax; - assert(qmin <= qmax); + av_assert0(qmin <= qmax); switch (pict_type) { case AV_PICTURE_TYPE_B: @@ -783,7 +780,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) } if (s->flags & CODEC_FLAG_PASS2) { - assert(picture_number >= 0); + av_assert0(picture_number >= 0); if (picture_number >= rcc->num_entries) { av_log(s, AV_LOG_ERROR, "Input is longer than 2-pass log file\n"); return -1; @@ -818,7 +815,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) short_term_q = 0; /* avoid warning */ if (s->flags & CODEC_FLAG_PASS2) { if (pict_type != AV_PICTURE_TYPE_I) - assert(pict_type == rce->new_pict_type); + av_assert0(pict_type == rce->new_pict_type); q = rce->new_qscale / br_compensation; av_dlog(s, "%f %f %f last:%d var:%"PRId64" type:%d//\n", q, rce->new_qscale, @@ -857,9 +854,9 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) if (q < 0) return -1; - assert(q > 0.0); + av_assert0(q > 0.0); q = get_diff_limited_q(s, rce, q); - assert(q > 0.0); + av_assert0(q > 0.0); // FIXME type dependent blur like in 2-pass if (pict_type == AV_PICTURE_TYPE_P || s->intra_only) { @@ -870,13 +867,13 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) rcc->short_term_qcount++; q = short_term_q = rcc->short_term_qsum / rcc->short_term_qcount; } - assert(q > 0.0); + av_assert0(q > 0.0); q = modify_qscale(s, rce, q, picture_number); rcc->pass1_wanted_bits += s->bit_rate / fps; - assert(q > 0.0); + av_assert0(q > 0.0); } if (s->avctx->debug & FF_DEBUG_RC) { @@ -975,7 +972,7 @@ static int init_pass2(MpegEncContext *s) qscale[i] = get_qscale(s, &rcc->entry[i], rate_factor, i); rcc->last_qscale_for[rce->pict_type] = qscale[i]; } - assert(filter_size % 2 == 1); + av_assert0(filter_size % 2 == 1); /* fixed I/B QP relative to P mode */ for (i = FFMAX(0, rcc->num_entries - 300); i < rcc->num_entries; i++) { @@ -1047,7 +1044,7 @@ static int init_pass2(MpegEncContext *s) qscale_sum += av_clip(rcc->entry[i].new_qscale / FF_QP2LAMBDA, s->avctx->qmin, s->avctx->qmax); } - assert(toobig <= 40); + av_assert0(toobig <= 40); av_log(s->avctx, AV_LOG_DEBUG, "[lavc rc] requested bitrate: %d bps expected bitrate: %d bps\n", s->bit_rate,

1 0

avcodec/vp3: use init_get_bits8()
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 30 15:00:13 2015 +0000| [2ff7e81b3c5e48256f5b720ab4dab6e050507b2b] | committer: Paul B Mahol avcodec/vp3: use init_get_bits8() Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ff7e81b3c5e48256… --- libavcodec/vp3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 726eda0..37d41b8 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1998,7 +1998,8 @@ static int vp3_decode_frame(AVCodecContext *avctx, GetBitContext gb; int i, ret; - init_get_bits(&gb, buf, buf_size * 8); + if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0) + return ret; #if CONFIG_THEORA_DECODER if (s->theora && get_bits1(&gb)) { @@ -2491,7 +2492,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx) for (i = 0; i < 3; i++) { if (header_len[i] <= 0) continue; - init_get_bits(&gb, header_start[i], header_len[i] * 8); + init_get_bits8(&gb, header_start[i], header_len[i]); ptype = get_bits(&gb, 8);

1 0

Merge remote-tracking branch 'cehoyos/master'
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Jan 30 19:01:53 2015 +0100| [dffc16d52314992123b22149fc03eb0ca76d1e54] | committer: Michael Niedermayer Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Respect horizontal differencing predictor for 16bit gray tiff images. Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dffc16d5231499212… ---

1 0

Respect horizontal differencing predictor for 16bit gray tiff images.
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Fri Jan 30 14:12:55 2015 +0100| [50144b91ea50757c57c94a3927bf14a6ffea0de8] | committer: Carl Eugen Hoyos Respect horizontal differencing predictor for 16bit gray tiff images. Fixes ticket #4291. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50144b91ea50757c5… --- libavcodec/tiff.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 8047f38..4fe1168 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1293,6 +1293,8 @@ static int decode_frame(AVCodecContext *avctx, ssize = s->width * soff; if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE || s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE || + s->avctx->pix_fmt == AV_PIX_FMT_GRAY16LE || + s->avctx->pix_fmt == AV_PIX_FMT_YA16LE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16LE || s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16LE) { for (i = 0; i < s->height; i++) { @@ -1302,6 +1304,8 @@ static int decode_frame(AVCodecContext *avctx, } } else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE || s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE || + s->avctx->pix_fmt == AV_PIX_FMT_GRAY16BE || + s->avctx->pix_fmt == AV_PIX_FMT_YA16BE || s->avctx->pix_fmt == AV_PIX_FMT_GBRP16BE || s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16BE) { for (i = 0; i < s->height; i++) {

1 0

lavfi: remove mp=softpulldown
by git＠videolan.org 30 Jan '15

30 Jan '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jan 29 13:45:55 2015 +0000| [9fd925dee58d6af846f5ff4f63f5052ec4075581] | committer: Paul B Mahol lavfi: remove mp=softpulldown It is supposed to work correctly with MEncoder only. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fd925dee58d6af84… --- doc/filters.texi | 1 - libavfilter/Makefile | 1 - libavfilter/libmpcodecs/vf_softpulldown.c | 163 ----------------------------- libavfilter/version.h | 2 +- libavfilter/vf_mp.c | 3 - 5 files changed, 1 insertion(+), 169 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index cba2697..26f8ff9 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6284,7 +6284,6 @@ the named filter. The list of the currently supported filters follows: @table @var -@item softpulldown @end table The parameter syntax and behavior for the listed filters are the same diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 7e0d456..69fbb60 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -228,7 +228,6 @@ OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o -OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o # multimedia filters OBJS-$(CONFIG_AVECTORSCOPE_FILTER) += avf_avectorscope.o diff --git a/libavfilter/libmpcodecs/vf_softpulldown.c b/libavfilter/libmpcodecs/vf_softpulldown.c deleted file mode 100644 index 556374e..0000000 --- a/libavfilter/libmpcodecs/vf_softpulldown.c +++ /dev/null @@ -1,163 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "config.h" -#include "mp_msg.h" - -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" - -#include "libvo/fastmemcpy.h" - -struct vf_priv_s { - int state; - long long in; - long long out; -}; - -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) -{ - mp_image_t *dmpi; - int ret = 0; - int flags = mpi->fields; - int state = vf->priv->state; - - dmpi = ff_vf_get_image(vf->next, mpi->imgfmt, - MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE | - MP_IMGFLAG_PRESERVE, mpi->width, mpi->height); - - vf->priv->in++; - - if ((state == 0 && - !(flags & MP_IMGFIELD_TOP_FIRST)) || - (state == 1 && - flags & MP_IMGFIELD_TOP_FIRST)) { - ff_mp_msg(MSGT_VFILTER, MSGL_WARN, - "softpulldown: Unexpected field flags: state=%d top_field_first=%d repeat_first_field=%d\n", - state, - (flags & MP_IMGFIELD_TOP_FIRST) != 0, - (flags & MP_IMGFIELD_REPEAT_FIRST) != 0); - state ^= 1; - } - - if (state == 0) { - ret = ff_vf_next_put_image(vf, mpi, MP_NOPTS_VALUE); - vf->priv->out++; - if (flags & MP_IMGFIELD_REPEAT_FIRST) { - my_memcpy_pic(dmpi->planes[0], - mpi->planes[0], mpi->w, mpi->h/2, - dmpi->stride[0]*2, mpi->stride[0]*2); - if (mpi->flags & MP_IMGFLAG_PLANAR) { - my_memcpy_pic(dmpi->planes[1], - mpi->planes[1], - mpi->chroma_width, - mpi->chroma_height/2, - dmpi->stride[1]*2, - mpi->stride[1]*2); - my_memcpy_pic(dmpi->planes[2], - mpi->planes[2], - mpi->chroma_width, - mpi->chroma_height/2, - dmpi->stride[2]*2, - mpi->stride[2]*2); - } - state=1; - } - } else { - my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0], - mpi->planes[0]+mpi->stride[0], mpi->w, mpi->h/2, - dmpi->stride[0]*2, mpi->stride[0]*2); - if (mpi->flags & MP_IMGFLAG_PLANAR) { - my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1], - mpi->planes[1]+mpi->stride[1], - mpi->chroma_width, mpi->chroma_height/2, - dmpi->stride[1]*2, mpi->stride[1]*2); - my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2], - mpi->planes[2]+mpi->stride[2], - mpi->chroma_width, mpi->chroma_height/2, - dmpi->stride[2]*2, mpi->stride[2]*2); - } - ret = ff_vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE); - vf->priv->out++; - if (flags & MP_IMGFIELD_REPEAT_FIRST) { - ret |= ff_vf_next_put_image(vf, mpi, MP_NOPTS_VALUE); - vf->priv->out++; - state=0; - } else { - my_memcpy_pic(dmpi->planes[0], - mpi->planes[0], mpi->w, mpi->h/2, - dmpi->stride[0]*2, mpi->stride[0]*2); - if (mpi->flags & MP_IMGFLAG_PLANAR) { - my_memcpy_pic(dmpi->planes[1], - mpi->planes[1], - mpi->chroma_width, - mpi->chroma_height/2, - dmpi->stride[1]*2, - mpi->stride[1]*2); - my_memcpy_pic(dmpi->planes[2], - mpi->planes[2], - mpi->chroma_width, - mpi->chroma_height/2, - dmpi->stride[2]*2, - mpi->stride[2]*2); - } - } - } - - vf->priv->state = state; - - return ret; -} - -static int config(struct vf_instance *vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt) -{ - return ff_vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); -} - -static void uninit(struct vf_instance *vf) -{ - ff_mp_msg(MSGT_VFILTER, MSGL_INFO, "softpulldown: %lld frames in, %lld frames out\n", vf->priv->in, vf->priv->out); - free(vf->priv); -} - -static int vf_open(vf_instance_t *vf, char *args) -{ - vf->config = config; - vf->put_image = put_image; - vf->uninit = uninit; - vf->default_reqs = VFCAP_ACCEPT_STRIDE; - vf->priv = calloc(1, sizeof(struct vf_priv_s)); - vf->priv->state = 0; - return 1; -} - -const vf_info_t ff_vf_info_softpulldown = { - "mpeg2 soft 3:2 pulldown", - "softpulldown", - "Tobias Diedrich <ranma+mplayer(a)tdiedrich.de>", - "", - vf_open, - NULL -}; diff --git a/libavfilter/version.h b/libavfilter/version.h index ce22f7b..9bc7e77 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 5 #define LIBAVFILTER_VERSION_MINOR 9 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MICRO 102 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c index 63fdedd..59bd60d 100644 --- a/libavfilter/vf_mp.c +++ b/libavfilter/vf_mp.c @@ -124,10 +124,7 @@ static const struct { {0, AV_PIX_FMT_NONE} }; -extern const vf_info_t ff_vf_info_softpulldown; - static const vf_info_t* const filters[]={ - &ff_vf_info_softpulldown, NULL };

1 0