virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

simplify ipod brand selection

Browse Source 
Originally committed as revision 13770 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-06-14 21:07:59 +00:00
parent 7b0fb8b77a
commit cd70d17f5f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/movenc.c
View File

@ -1378,11 +1378,13 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
{ {
MOVContext *mov = s->priv_data; MOVContext *mov = s->priv_data;
offset_t pos = url_ftell(pb); offset_t pos = url_ftell(pb);
int has_h264 = 0; int has_h264 = 0, has_video = 0;
int i; int i;
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
if (st->codec->codec_type == CODEC_TYPE_VIDEO)
has_video = 1;
if (st->codec->codec_id == CODEC_ID_H264) if (st->codec->codec_id == CODEC_ID_H264)
has_h264 = 1; has_h264 = 1;
} }
@ -1398,15 +1400,9 @@ static int mov_write_ftyp_tag(ByteIOContext *pb, AVFormatContext *s)
put_tag(pb, "MSNV"); put_tag(pb, "MSNV");
else if (mov->mode == MODE_MP4) else if (mov->mode == MODE_MP4)
put_tag(pb, "isom"); put_tag(pb, "isom");
else if (mov->mode == MODE_IPOD) { else if (mov->mode == MODE_IPOD)
for (i = 0; i < s->nb_streams; i++) put_tag(pb, has_video ? "M4V ":"M4A ");
if (s->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) { else
put_tag(pb, "M4V ");
break;
}
if (i == s->nb_streams)
put_tag(pb, "M4A ");
} else
put_tag(pb, "qt "); put_tag(pb, "qt ");
put_be32(pb, 0x200); put_be32(pb, 0x200);