Merge commit 'd09b4cce21cdad5ef2855698395ffd6e37445212'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 21:53:08 +0000 (23:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 21:53:08 +0000 (23:53 +0200)
commit2a33dc2cdf6d62204f6f5c425c185d714403daa6
treeaa3ccf65c4f4accd6630d97c2b092bf332f02ab8
parent91748662bc024294d50e2e0542d727265e331105
parentd09b4cce21cdad5ef2855698395ffd6e37445212
Merge commit 'd09b4cce21cdad5ef2855698395ffd6e37445212'

* commit 'd09b4cce21cdad5ef2855698395ffd6e37445212':
  mpjpeg: Simplify using avio_printf

Conflicts:
libavformat/mpjpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpjpeg.c