diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:50:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 14:57:14 +0200 |
| commit | bdb4ed963f7ecf919075838a64904fd6e49d07ba (patch) | |
| tree | 1da7dfbb1ba1efc2d322ecde0982cafdfdc3f104 /libavformat/4xm.c | |
| parent | a5d67bc796e1f9a2b99b43ea807166b655e4bdbc (diff) | |
| parent | a7c1689dedd11689edb30088d467ac03f9b8d1cf (diff) | |
| download | ffmpeg-bdb4ed963f7ecf919075838a64904fd6e49d07ba.tar.gz | |
Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'
* commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf':
4xm: check that bits per sample is strictly positive
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
| -rw-r--r-- | libavformat/4xm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 3714297dae..87ecf9f4cf 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -150,7 +150,7 @@ static int parse_strk(AVFormatContext *s, if (fourxm->tracks[track].channels <= 0 || fourxm->tracks[track].sample_rate <= 0 || - fourxm->tracks[track].bits < 0) { + fourxm->tracks[track].bits <= 0) { av_log(s, AV_LOG_ERROR, "audio header invalid\n"); return AVERROR_INVALIDDATA; } |