Skip to content

F
ffmpeg.wasm-core
Commit 6a3a7d7a authored by Clément Bœsch's avatar Clément Bœsch
Browse files
Options

avformat/vobsub: remove pointless FAIL macro.

parent 97edb195
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
libavformat/mpeg.c
View file @ 6a3a7d7a
...@@ -828,8 +828,6 @@ end: ...@@ -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) ...@@ -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) ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment