diff options
| author | Clément Bœsch <u@pkh.me> | 2014-05-01 16:16:38 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2014-05-01 16:16:54 +0200 |
| commit | 6a3a7d7af1b650ea3ca21bb71b32648c12c01403 (patch) | |
| tree | a77816dce3abde4c90a31da1e7e28ebf1b5d4250 /libavformat/mpeg.c | |
| parent | 97edb195f45c266c5a1bcdd3674825d926fd18cf (diff) | |
| download | ffmpeg-streaming-6a3a7d7af1b650ea3ca21bb71b32648c12c01403.zip ffmpeg-streaming-6a3a7d7af1b650ea3ca21bb71b32648c12c01403.tar.gz | |
avformat/vobsub: remove pointless FAIL macro.
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index e07e41d..d0b1527 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -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) |
