videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/vobsub: remove pointless FAIL macro.

This commit is contained in:
Clément Bœsch 2014-05-01 16:16:38 +02:00
parent 97edb195f4
commit 6a3a7d7af1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mpeg.c
View File

@ -828,8 +828,6 @@ end:
return ret;
}
#define FAIL(r) do { ret = r; goto fail; } while (0)
static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
{
MpegDemuxContext *vobsub = s->priv_data;
@ -878,7 +876,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) {
if (pkt->size) // raise packet even if incomplete
break;
FAIL(ret);
goto fail;
}
to_read = ret & 0xffff;
new_pos = avio_tell(pb);
@ -895,7 +893,7 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = av_grow_packet(pkt, to_read);
if (ret < 0)
FAIL(ret);
goto fail;
n = avio_read(pb, pkt->data + (pkt->size - to_read), to_read);
if (n < to_read)