Merge commit '6d8fd614ff957af242efcd8a6a0619874382f3a4'

* commit '6d8fd614ff957af242efcd8a6a0619874382f3a4':
  vorbis: Kill some pointless debug code

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc libavcodec/vorbis.c
index a8324248db32390bb8ad83047099da34c5755282,2c543208fa3a168e42fa3a882d6509144772ea83..399020eec55178628754f4f25917622183edd03e
--- 1/libavcodec/vorbis.c
--- 2/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@@ -74,24 -65,11 +69,16 @@@ int ff_vorbis_len2vlc(uint8_t *bits, ui
      for (i = 0; i < bits[p]; ++i)
          exit_at_level[i+1] = 1 << i;
  
- #ifdef DEBUG
-     av_log(NULL, AV_LOG_INFO, " %u. of %u code len %d code %d - ", p, num, bits[p], codes[p]);
-     init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]);
-     for (i = 0; i < bits[p]; ++i)
-         av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
-     av_log(NULL, AV_LOG_INFO, "\n");
- #endif
- 
      ++p;
  
 +    for (i = p; (bits[i] == 0) && (i < num); ++i)
 +        ;
 +    if (i == num)
 +        return 0;
 +
      for (; p < num; ++p) {
          if (bits[p] > 32)
 -             return 1;
 +             return AVERROR_INVALIDDATA;
          if (bits[p] == 0)
               continue;
          // find corresponding exit(node which the tree can grow further from)