Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 20:00:07 +0000 (22:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Apr 2014 20:19:16 +0000 (22:19 +0200)
commit881f4e8d344044956d8ed3ee370e5c1bd882e1a1
tree36f3ead18d2f52929b0a72fc0d4a7af7af8fd0a3
parenta0568ed2544025de3c66dd500811f5ba43f38af4
parenta420ccd4f2a011887451a7d5e1bebba4fd7c40e2
Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'

* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
  LucasArts SMUSH SANM video decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/sanm.c
libavcodec/version.h

See: 69254f46286099588514454f60fad12f6e51b2cd and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/sanm.c
libavcodec/utils.c
libavcodec/version.h