Merge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Feb 2013 11:30:30 +0000 (12:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Feb 2013 11:30:41 +0000 (12:30 +0100)
* commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0':
  vorbisdec: cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vorbisdec.c

index 5b1121c..874bd31 100644 (file)
@@ -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;