diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 17:09:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 17:09:37 +0100 |
| commit | 18fcdc098162c0bad0c15bf68a2c167a3fdebba4 (patch) | |
| tree | 297e340d620867c74a703392dfb9457136a9866f /libavcodec/mpeg4videodec.c | |
| parent | deccb4d827d6bfa11eac1c3c62e2afebb8e01667 (diff) | |
| download | ffmpeg-18fcdc098162c0bad0c15bf68a2c167a3fdebba4.tar.gz | |
avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 846b691b88..121aa38110 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2502,6 +2502,7 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) { MpegEncContext *s = &ctx->m; unsigned startcode, v; + int ret; /* search next start code */ align_get_bits(gb); @@ -2590,8 +2591,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) } if (startcode >= 0x120 && startcode <= 0x12F) { - if (decode_vol_header(ctx, gb) < 0) - return -1; + if ((ret = decode_vol_header(ctx, gb)) < 0) + return ret; } else if (startcode == USER_DATA_STARTCODE) { decode_user_data(ctx, gb); } else if (startcode == GOP_STARTCODE) { |