eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avformat/vobsub: remove pointless FAIL macro.

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