Mercurial > libavformat.hg

changeset 1336:06a5d191774d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
author bcoudurier
date Thu, 28 Sep 2006 17:59:26 +0000
parents 2cbaaf63ce18
children 229734e5c3ef
files mov.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Thu Sep 28 17:54:59 2006 +0000
+++ b/mov.c	Thu Sep 28 17:59:26 2006 +0000
@@ -985,12 +985,6 @@
                 break;
             }
 
-            bits_per_sample = av_get_bits_per_sample(st->codec->codec_id);
-            if (bits_per_sample) {
-                st->codec->bits_per_sample = bits_per_sample;
-                sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
-            }
-
             //Read QT version 1 fields. In version 0 theese dont exist
             dprintf("version =%d mp4=%d\n",version,c->mp4);
             if(version==1) {
@@ -1008,6 +1002,12 @@
                 get_be32(pb); /* bytes per audio packet if constant */
                 get_be32(pb); /* lpcm frames per audio packet if constant */
             }
+
+            bits_per_sample = av_get_bits_per_sample(st->codec->codec_id);
+            if (bits_per_sample) {
+                st->codec->bits_per_sample = bits_per_sample;
+                sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
+            }
         } else {
             /* other codec type, just skip (rtp, mp4s, tmcd ...) */
             url_fskip(pb, size - (url_ftell(pb) - start_pos));