Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:50:56 +0000 (23:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:51:39 +0000 (23:51 +0100)
* commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
  riff: Support QT RLE Animation in avi ('rle ' FourCC)

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

Simple merge