diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 00:49:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 01:03:50 +0200 |
| commit | 20ad2152ddc2606b0869e80ebf0b5154f13c7934 (patch) | |
| tree | 93f73bddeda8eca8fc39b7cc4f7bd05b1edfdd1f /libavformat | |
| parent | ddea3b7106b1d003fb1fb774c0be05db1319926d (diff) | |
| parent | 44386aaad870cbd80ae0d08247ebc663476446ff (diff) | |
| download | ffmpeg-20ad2152ddc2606b0869e80ebf0b5154f13c7934.tar.gz | |
Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'
* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
cdg: Forward error from avio_size() in read_header() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/cdg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/cdg.c b/libavformat/cdg.c index b2bc2cd6a1..f0c14a6366 100644 --- a/libavformat/cdg.c +++ b/libavformat/cdg.c @@ -46,9 +46,10 @@ static int read_header(AVFormatContext *s) avpriv_set_pts_info(vst, 32, 1, 300); ret = avio_size(s->pb); - if (ret > 0) - vst->duration = (ret * vst->time_base.den) / (CDG_PACKET_SIZE * 300); + if (ret < 0) + return ret; + vst->duration = (ret * vst->time_base.den) / (CDG_PACKET_SIZE * 300); return 0; } |