highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf/gif: simplify streams type checking.

Browse Source
This commit is contained in:
Clément Bœsch
2013-04-18 12:19:33 +02:00
parent 978e373499
commit 28f9858c91
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libavformat/gif.c
View File

@ -104,32 +104,23 @@ static int gif_write_header(AVFormatContext *s)
{ {
GIFContext *gif = s->priv_data; GIFContext *gif = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVCodecContext *enc, *video_enc; AVCodecContext *video_enc;
int i, width, height /*, rate*/; int width, height;
uint32_t palette[AVPALETTE_COUNT]; uint32_t palette[AVPALETTE_COUNT];
/* XXX: do we reject audio streams or just ignore them ? if (s->nb_streams != 1 || !s->streams[0]->codec ||
* if (s->nb_streams > 1) s->streams[0]->codec->codec_type != AVMEDIA_TYPE_VIDEO) {
* return -1; av_log(s, AV_LOG_ERROR,
*/ "GIF supports only a single video stream.\n");
return AVERROR(EINVAL);
}
gif->time = 0; gif->time = 0;
gif->file_time = 0; gif->file_time = 0;
video_enc = NULL; video_enc = s->streams[0]->codec;
for (i = 0; i < s->nb_streams; i++) {
enc = s->streams[i]->codec;
if (enc->codec_type != AVMEDIA_TYPE_AUDIO)
video_enc = enc;
}
if (!video_enc) {
av_free(gif);
return -1;
} else {
width = video_enc->width; width = video_enc->width;
height = video_enc->height; height = video_enc->height;
// rate = video_enc->time_base.den;
}
if (avpriv_set_systematic_pal2(palette, video_enc->pix_fmt) < 0) { if (avpriv_set_systematic_pal2(palette, video_enc->pix_fmt) < 0) {
av_assert0(video_enc->pix_fmt == AV_PIX_FMT_PAL8); av_assert0(video_enc->pix_fmt == AV_PIX_FMT_PAL8);
@ -174,9 +165,6 @@ static int gif_write_video(AVFormatContext *s, AVCodecContext *enc,
static int gif_write_packet(AVFormatContext *s, AVPacket *pkt) static int gif_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
AVCodecContext *codec = s->streams[pkt->stream_index]->codec; AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
if (codec->codec_type == AVMEDIA_TYPE_AUDIO)
return 0; /* just ignore audio */
else
return gif_write_video(s, codec, pkt->data, pkt->size); return gif_write_video(s, codec, pkt->data, pkt->size);
} }