[FFmpeg-cvslog] Fix interlaced prediction for RGB utvideo.

Carl Eugen Hoyos git at videolan.org
Mon Jun 18 09:03:09 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jun 18 09:01:35 2012 +0200| [3b3150ec9bfddd9bd57dcd378b43a8f363b0fc4f] | committer: Carl Eugen Hoyos

Fix interlaced prediction for RGB utvideo.

Fixes ticket #1215

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b3150ec9bfddd9bd57dcd378b43a8f363b0fc4f
---

 libavcodec/utvideo.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c
index d8699c6..ead192b 100644
--- a/libavcodec/utvideo.c
+++ b/libavcodec/utvideo.c
@@ -438,9 +438,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
             if (ret)
                 return ret;
             if (c->frame_pred == PRED_MEDIAN)
+                if (!c->interlaced) {
                 restore_median(c->pic.data[0] + rgb_order[i], c->planes,
                                c->pic.linesize[0], avctx->width, avctx->height,
                                c->slices, 0);
+                } else {
+                    restore_median_il(c->pic.data[0] + rgb_order[i], c->planes,
+                                      c->pic.linesize[0], avctx->width, avctx->height,
+                                      c->slices, 0);
+                }
         }
         restore_rgb_planes(c->pic.data[0], c->planes, c->pic.linesize[0],
                            avctx->width, avctx->height);



More information about the ffmpeg-cvslog mailing list