Mercurial > libavformat.hg

changeset 768:c71d10dfc681 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l (overwriting w/h with 0)
author michael
date Sat, 21 May 2005 02:06:45 +0000
parents cbfea73709bd
children 23570fc45b40
files mov.c
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Fri May 20 13:10:09 2005 +0000
+++ b/mov.c	Sat May 21 02:06:45 2005 +0000
@@ -840,16 +840,13 @@
             get_be32(pb); /* vendor */
             get_be32(pb); /* temporal quality */
             get_be32(pb); /* spacial quality */
-            st->codec.width = get_be16(pb); /* width */
-            st->codec.height = get_be16(pb); /* height */
-#if 1
-            if (st->codec.codec_id == CODEC_ID_MPEG4) {
-                /* in some MPEG4 the width/height are not correct, so
-                   we ignore this info */
-                st->codec.width = 0;
-                st->codec.height = 0;
+            if(st->codec.codec_id == CODEC_ID_MPEG4){ //FIXME this is silly
+                get_be16(pb);
+                get_be16(pb);
+            }else{
+                st->codec.width = get_be16(pb); /* width */
+                st->codec.height = get_be16(pb); /* height */
             }
-#endif
             get_be32(pb); /* horiz resolution */
             get_be32(pb); /* vert resolution */
             get_be32(pb); /* data size, always 0 */