diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-03 16:19:14 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-03 16:19:14 +0000 |
| commit | 48855b26d4c8fb6876384961cbefaff84b8c055e (patch) | |
| tree | cdb983a3de5b6adeeafef20fc71e557127a0bb53 /libavformat | |
| parent | f5a9e8f33db276008ebcad6cc0a54cca5350d45c (diff) | |
| download | ffmpeg-48855b26d4c8fb6876384961cbefaff84b8c055e.tar.gz | |
do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov
Originally committed as revision 6890 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index df4edc332b..582d6221d9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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); |