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

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
This commit is contained in:
Michael Niedermayer 2008-02-06 01:51:32 +00:00
parent 63f2670a53
commit 744a9c75cf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mov.c
View File

@ -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 */