changeset 1849:acd6287f79e1 libavformat

deobfuscate, clearly split mov case
author bcoudurier
date Sun, 04 Mar 2007 01:48:06 +0000
parents ffa08e7f7c88
children 4d4e0ab8c667
files movenc.c
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/movenc.c	Sat Mar 03 21:14:10 2007 +0000
+++ b/movenc.c	Sun Mar 04 01:48:06 2007 +0000
@@ -341,11 +341,16 @@
     put_be16(pb, 0); /* Revision level */
     put_be32(pb, 0); /* Reserved */
 
-    put_be16(pb, track->mode == MODE_MOV ? track->enc->channels : 2); /* Number of channels */
-    /* FIXME 8 bit for 'raw ' in mov */
-    put_be16(pb, 16); /* Reserved */
+    if (track->mode == MODE_MOV) {
+        put_be16(pb, track->enc->channels);
+        put_be16(pb, 16); /* FIXME 8 bit for 'raw ' in mov */
+        put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */
+    } else { /* reserved for mp4/3gp */
+        put_be16(pb, 2);
+        put_be16(pb, 16);
+        put_be16(pb, 0);
+    }
 
-    put_be16(pb, track->mode == MODE_MOV && track->audio_vbr ? -2 : 0); /* compression ID */
     put_be16(pb, 0); /* packet size (= 0) */
     put_be16(pb, track->timescale); /* Time scale */
     put_be16(pb, 0); /* Reserved */