Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 19:05:23 +0000 (21:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Mar 2015 19:05:23 +0000 (21:05 +0200)
commit794e9fb5a649b4489e7369eb846049d4a03f3ff9
tree775f1981d407c36b0ebdc8daa61bb3f2c920025d
parent847c0d333b6a195670f5bd64e9f7e5c9cf254cc4
parente6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80
Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'

* commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80':
  mjpeg: Move code only used in the encoder(s) to the appropriate header

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeglsenc.c
libavcodec/mjpeg.h
libavcodec/mjpegdec.c
libavcodec/mjpegenc.h
libavcodec/mjpegenc_common.c