Mercurial > mplayer.hg

comparison libmpcodecs/vf_lavfi.c @ 35707:4ba6b8d3197e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace PixelFormat and PIX_FMT_FOO by their AV_-prefixed counterparts.
author diego
date Sun, 20 Jan 2013 18:18:33 +0000
parents b6191f9936ec
children
comparison
equal deleted inserted replaced
35706:bab4ce2b0d01 35707:4ba6b8d3197e
31 AVFilterGraph *graph; 31 AVFilterGraph *graph;
32 AVFilterContext *in; 32 AVFilterContext *in;
33 AVFilterContext *out; 33 AVFilterContext *out;
34 int in_w; 34 int in_w;
35 int in_h; 35 int in_h;
36 enum PixelFormat in_pixfmt; 36 enum AVPixelFormat in_pixfmt;
37 int in_imgfmt; 37 int in_imgfmt;
38 AVRational in_sar; 38 AVRational in_sar;
39 int out_w; 39 int out_w;
40 int out_h; 40 int out_h;
41 enum PixelFormat out_pixfmt; 41 enum AVPixelFormat out_pixfmt;
42 int out_imgfmt; 42 int out_imgfmt;
43 AVRational out_sar; 43 AVRational out_sar;
44 struct AVFilterBufferRef *in_buf; 44 struct AVFilterBufferRef *in_buf;
45 mp_image_t *in_mpi; 45 mp_image_t *in_mpi;
46 }; 46 };
49 { 49 {
50 ((mp_image_t *)buf->priv)->usage_count--; 50 ((mp_image_t *)buf->priv)->usage_count--;
51 av_free(buf); 51 av_free(buf);
52 } 52 }
53 53
54 static AVFilterBufferRef *mpi_to_bufref(mp_image_t *mpi, enum PixelFormat fmt, 54 static AVFilterBufferRef *mpi_to_bufref(mp_image_t *mpi, enum AVPixelFormat fmt,
55 AVRational sar) 55 AVRational sar)
56 { 56 {
57 AVFilterBufferRef *buf; 57 AVFilterBufferRef *buf;
58 int perms = AV_PERM_READ; 58 int perms = AV_PERM_READ;
59 59
92 static int mpsink_query_formats(AVFilterContext *ctx) 92 static int mpsink_query_formats(AVFilterContext *ctx)
93 { 93 {
94 struct mpsink_priv *c = ctx->priv; 94 struct mpsink_priv *c = ctx->priv;
95 struct vf_instance *vf = c->vf; 95 struct vf_instance *vf = c->vf;
96 AVFilterFormats *all; 96 AVFilterFormats *all;
97 enum PixelFormat *sup; 97 enum AVPixelFormat *sup;
98 unsigned i, nsup = 0; 98 unsigned i, nsup = 0;
99 int ifmt; 99 int ifmt;
100 100
101 all = avfilter_all_formats(AVMEDIA_TYPE_VIDEO); 101 all = avfilter_all_formats(AVMEDIA_TYPE_VIDEO);
102 sup = av_mallocz(sizeof(*sup) * (all->format_count + 1)); 102 sup = av_mallocz(sizeof(*sup) * (all->format_count + 1));
184 } 184 }
185 185
186 static int mpsrc_query_formats(AVFilterContext *ctx) 186 static int mpsrc_query_formats(AVFilterContext *ctx)
187 { 187 {
188 struct mpsrc_priv *c = ctx->priv; 188 struct mpsrc_priv *c = ctx->priv;
189 enum PixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, PIX_FMT_NONE }; 189 enum AVPixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, PIX_FMT_NONE };
190 avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts)); 190 avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts));
191 return 0; 191 return 0;
192 } 192 }
193 193
194 static int mpsrc_config_props(AVFilterLink *link) 194 static int mpsrc_config_props(AVFilterLink *link)