diff options
author | S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu> | 2010-08-07 04:02:26 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-07 04:02:26 +0400 |
commit | d54e0948e0fc8c17e9f409b716f982faf0470101 (patch) | |
tree | 1dd675bcd4d23a9c26956a4eee7826afba64d0d0 /ffplay.c | |
parent | 59ff3fd536051b005f1cec53ca60e4d0e2cde126 (diff) |
Move format from AVFilterBuffer to AVFilterPicRef.
Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|.
Originally committed as revision 24728 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r-- | ffplay.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1585,8 +1585,8 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) ref->w = codec->width; ref->h = codec->height; for(i = 0; i < 4; i ++) { - unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->pic->format].log2_chroma_w : 0; - unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->pic->format].log2_chroma_h : 0; + unsigned hshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_w : 0; + unsigned vshift = (i == 1 || i == 2) ? av_pix_fmt_descriptors[ref->format].log2_chroma_h : 0; if (ref->data[i]) { ref->data[i] += (edge >> hshift) + ((edge * ref->linesize[i]) >> vshift); @@ -1617,7 +1617,7 @@ static int input_reget_buffer(AVCodecContext *codec, AVFrame *pic) } if ((codec->width != ref->w) || (codec->height != ref->h) || - (codec->pix_fmt != ref->pic->format)) { + (codec->pix_fmt != ref->format)) { av_log(codec, AV_LOG_ERROR, "Picture properties changed.\n"); return -1; } @@ -1671,7 +1671,7 @@ static int input_request_frame(AVFilterLink *link) } else { picref = avfilter_get_video_buffer(link, AV_PERM_WRITE, link->w, link->h); av_picture_copy((AVPicture *)&picref->data, (AVPicture *)priv->frame, - picref->pic->format, link->w, link->h); + picref->format, link->w, link->h); } av_free_packet(&pkt); |