xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov

Browse Source 
Originally committed as revision 6890 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2006-11-03 16:19:14 +00:00
parent f5a9e8f33d
commit 48855b26d4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mov.c
View File

@ -803,9 +803,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
st->codec->codec_tag = format;
id = codec_get_id(mov_audio_tags, format);
if (id > 0) {
if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {
st->codec->codec_type = CODEC_TYPE_AUDIO;
} else if (format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
} else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */
format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
id = codec_get_id(mov_video_tags, format);
if (id <= 0)
id = codec_get_id(codec_bmp_tags, format);