RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Select non jpeg if there are multiple substreams. 

Originally committed as revision 11621 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-01-26 19:50:04 +00:00
parent 1521c500da
commit 0bc4728e3b
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

@ -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;
}