diff h261.c @ 2270:21f450be6cb5 libavcodec

lowres width/height cleanup 3rd try
author michael
date Mon, 27 Sep 2004 11:50:56 +0000
parents 514949de5d15
children 89a5e4601343
line wrap: on
line diff
--- a/h261.c	Mon Sep 27 10:06:10 2004 +0000
+++ b/h261.c	Mon Sep 27 11:50:56 2004 +0000
@@ -118,8 +118,8 @@
     MPV_decode_defaults(s);
     s->avctx = avctx;
 
-    s->width  = s->avctx->width  >> avctx->lowres;
-    s->height = s->avctx->height >> avctx->lowres;
+    s->width  = s->avctx->coded_width;
+    s->height = s->avctx->coded_height;
     s->codec_id = s->avctx->codec->id;
 
     s->out_format = FMT_H261;
@@ -715,15 +715,14 @@
         return -1;
     }
 
-    if (s->width >> avctx->lowres != avctx->width || s->height >> avctx->lowres != avctx->height){
+    if (s->width != avctx->coded_width || s->height != avctx->coded_height){
         ParseContext pc= s->parse_context; //FIXME move these demuxng hack to avformat
         s->parse_context.buffer=0;
         MPV_common_end(s);
         s->parse_context= pc;
     }
     if (!s->context_initialized) {
-        avctx->width  = s->width  >> avctx->lowres;
-        avctx->height = s->height >> avctx->lowres;
+        avcodec_set_dimensions(avctx, s->width, s->height);
 
         goto retry;
     }