Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Sep 2011 19:57:24 +0000 (21:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Sep 2011 19:57:47 +0000 (21:57 +0200)
commit3ee83f46058449913abeca7ba82e8e2909828209
tree20d83fc9cb70dfc35d7574e2cd59e62806fe6e07
parent205c13685f36a17f406b7cd07e14b6d2a61f396a
parent940173d4d1e40b025f0ac15f2572eef537fb1186
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf utils: Remove write-only variable
  lavf utils: Rename shadowing variable
  smacker: fix a few off by 1 errors
  Check for invalid VLC value in smacker decoder.
  Check and propagate errors when VLC trees cannot be built in smacker decoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c