Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 22:44:28 +0000 (00:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jun 2015 22:44:28 +0000 (00:44 +0200)
commit8985e7c56130b42f6184b064b7141e365f59356b
treea957787aa28a0bb5d1a9012daf2ece37edcfb3f7
parent7856afef524da4eb93e1c823f9cdcd6a2badb3fe
parent9b56ac74b170d12027fbc81f581a451a709f1105
Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'

* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
  mpjpeg: Initial implementation

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/Makefile
libavformat/allformats.c
libavformat/mpjpegdec.c
libavformat/version.h