Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 17:47:18 +0000 (19:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 17:47:58 +0000 (19:47 +0200)
commit0c67ef272943c10decb9243c95fc209a7d3f2e12
tree2f31da67db1e439077fbef36257ff3a2d71d37e9
parente37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573
parent86a0432688216562926d4aee36118f01be6d5e1b
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'

* commit '86a0432688216562926d4aee36118f01be6d5e1b':
  Silicon Graphics Motion Video Compressor 1 & 2 decoder

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h

See: 746b1dcc98b466e4abd301f304127583722ad80b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/utils.c
libavcodec/version.h