virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

tty: factorise returning error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2011-06-03 20:43:48 +02:00
parent e762b1ce95
commit 8346f60afb
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/tty.c
View File

@ -73,21 +73,20 @@ static int read_header(AVFormatContext *avctx,
AVFormatParameters *ap) AVFormatParameters *ap)
{ {
TtyDemuxContext *s = avctx->priv_data; TtyDemuxContext *s = avctx->priv_data;
int width = 0, height = 0, ret; int width = 0, height = 0, ret = 0;
AVStream *st = av_new_stream(avctx, 0); AVStream *st = av_new_stream(avctx, 0);
if (!st)
return AVERROR(ENOMEM); if (!st) {
ret = AVERROR(ENOMEM);
goto fail;
}
st->codec->codec_tag = 0; st->codec->codec_tag = 0;
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_ANSI; st->codec->codec_id = CODEC_ID_ANSI;
if (s->video_size) { if (s->video_size && (ret = av_parse_video_size(&width, &height, s->video_size)) < 0) {
ret = av_parse_video_size(&width, &height, s->video_size); av_log (avctx, AV_LOG_ERROR, "Couldn't parse video size.\n");
av_freep(&s->video_size); goto fail;
if (ret < 0) {
av_log (avctx, AV_LOG_ERROR, "Couldn't parse video size.\n");
return ret;
}
} }
#if FF_API_FORMAT_PARAMETERS #if FF_API_FORMAT_PARAMETERS
if (ap->width > 0) if (ap->width > 0)
@ -121,7 +120,9 @@ static int read_header(AVFormatContext *avctx,
avio_seek(avctx->pb, 0, SEEK_SET); avio_seek(avctx->pb, 0, SEEK_SET);
} }
return 0; fail:
av_freep(&s->video_size);
return ret;
} }
static int read_packet(AVFormatContext *avctx, AVPacket *pkt) static int read_packet(AVFormatContext *avctx, AVPacket *pkt)