diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-02-06 01:51:32 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-02-06 01:51:32 +0000 |
| commit | 744a9c75cf38fdc199ef1163d0d09e02380b072e (patch) | |
| tree | afafa546b66e77de5fb4323a45c2e326b1ccec17 /libavformat/mov.c | |
| parent | 63f2670a53aaedc7a9fff14e87da575548078f4d (diff) | |
| download | ffmpeg-744a9c75cf38fdc199ef1163d0d09e02380b072e.tar.gz | |
Allow the user to select which codec out of several in stsd he wants.
Originally committed as revision 11873 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index f39d9a227f..151bd60ca2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -600,7 +600,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) get_be16(pb); /* reserved */ get_be16(pb); /* index */ - if (st->codec->codec_tag && st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g')) { + if (st->codec->codec_tag && + (c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id + : st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g')) + ){ /* multiple fourcc, we skip jpeg, this isnt correct, we should export it as seperate AVStream but this needs a few changes in the mov demuxer, patch welcome */ |