generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Originally committed as revision 11908 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-02-11 22:23:05 +00:00
parent 22ed53e5f4
commit 77c7543702
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mov.c
View File

@ -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, ByteIOContext *pb, MOV_atom_t atom)
/* 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 *mov, AVStream *st)
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;