[FFmpeg-cvslog] r11908 - trunk/libavformat/mov.c
bcoudurier
subversion
Mon Feb 11 23:23:05 CET 2008
Author: bcoudurier
Date: Mon Feb 11 23:23:05 2008
New Revision: 11908
Log:
use correct demux mechanism when audio compression id is -2, dv audio does not matter, demux partially qt_dv_pal_test.mov which does NOT use cid -2
Modified:
trunk/libavformat/mov.c
Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c (original)
+++ trunk/libavformat/mov.c Mon Feb 11 23:23:05 2008
@@ -108,6 +108,7 @@ typedef struct MOVStreamContext {
unsigned int samples_per_frame;
int dv_audio_container;
int pseudo_stream_id;
+ int16_t audio_cid; ///< stsd audio compression id
} MOVStreamContext;
typedef struct MOVContext {
@@ -743,7 +744,7 @@ static int mov_read_stsd(MOVContext *c,
/* do we need to force to 16 for AMR ? */
/* handle specific s8 codec */
- get_be16(pb); /* compression id = 0*/
+ sc->audio_cid = get_be16(pb);
get_be16(pb); /* packet size = 0 */
st->codec->sample_rate = ((get_be32(pb) >> 16));
@@ -1329,7 +1330,8 @@ static void mov_build_index(MOVContext *
unsigned int stss_index = 0;
unsigned int i, j, k;
- if (sc->sample_sizes || st->codec->codec_type == CODEC_TYPE_VIDEO || sc->dv_audio_container) {
+ if (sc->sample_sizes || st->codec->codec_type == CODEC_TYPE_VIDEO ||
+ sc->audio_cid == -2) {
unsigned int current_sample = 0;
unsigned int stts_sample = 0;
unsigned int keyframe, sample_size;
More information about the ffmpeg-cvslog
mailing list