Commit 0bc4728e authored by Michael Niedermayer's avatar Michael Niedermayer

Select non jpeg if there are multiple substreams.

Originally committed as revision 11621 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1521c500
......@@ -600,8 +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) {
/* multiple fourcc, just skip for now */
if (st->codec->codec_tag && 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 */
url_fskip(pb, size - (url_ftell(pb) - start_pos));
continue;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment