Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 18:15:27 +0000 (20:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 18:17:33 +0000 (20:17 +0200)
commit01a39a978c143747b50d0b2660cd100c96722cbd
tree36dc0700a5843973437dd1e2e3259f1e7254d8e0
parent0c67ef272943c10decb9243c95fc209a7d3f2e12
parent55ddd700c67529ff2c6c4e976673f1341bba7a82
Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h

See: 6fb40779cd3457a819e20d6db91a142c47cad3c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/mvdec.c
libavformat/version.h