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