Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
eeadcdfd1a
* commit 'eeadcdfd1a': LucasArts SMUSH demuxer Conflicts: Changelog doc/general.texi libavformat/smush.c libavformat/version.h See: bef8fd7099 Merged-by: Michael Niedermayer <michaelni@gmx.at>
bef8fd7099
Signed-off-by: Paul B Mahol <onemda@gmail.com>