Merge commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:33:00 +0000 (12:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Jun 2013 10:33:00 +0000 (12:33 +0200)
* commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31':
  vmd: decode videos with no LZ buffer size provided - they might not need it

Conflicts:
libavcodec/vmdav.c

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

Simple merge