aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vorbisdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-25 12:30:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-25 12:30:41 +0100
commita0312a2e853148656704914b7ff56f0d8034f6ac (patch)
tree8dfddff5edf56ecd071fafe494b471f250943b74 /libavcodec/vorbisdec.c
parentcb72f698fe5d85f43fa33628718d450dbd066d1c (diff)
parentfc386f2eea8d93ecd4f81e1646c835d1645c56a0 (diff)
downloadffmpeg-a0312a2e853148656704914b7ff56f0d8034f6ac.tar.gz
Merge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0'
* commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0': vorbisdec: cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbisdec.c')
-rw-r--r--libavcodec/vorbisdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 5b1121ce27..874bd31f74 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -592,7 +592,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
floor_setup->data.t0.order = get_bits(gb, 8);
floor_setup->data.t0.rate = get_bits(gb, 16);
floor_setup->data.t0.bark_map_size = get_bits(gb, 16);
- if (floor_setup->data.t0.bark_map_size == 0) {
+ if (!floor_setup->data.t0.bark_map_size) {
av_log(vc->avccontext, AV_LOG_ERROR,
"Floor 0 bark map size is 0.\n");
return AVERROR_INVALIDDATA;
@@ -600,7 +600,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
floor_setup->data.t0.amplitude_bits = get_bits(gb, 6);
/* zero would result in a div by zero later *
* 2^0 - 1 == 0 */
- if (floor_setup->data.t0.amplitude_bits == 0) {
+ if (!floor_setup->data.t0.amplitude_bits) {
av_log(vc->avccontext, AV_LOG_ERROR,
"Floor 0 amplitude bits is 0.\n");
return AVERROR_INVALIDDATA;