Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:18:02 +0000 (04:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:19:26 +0000 (04:19 +0100)
commitfb06b8ba9371495d051d2fd815a21fb1c1392b73
tree7e65ebf4b5e2f8b9af9cd4dbf19cb3e06bad8df0
parent0d9f2f5c47a008d3077510e499d68a4e960e2c66
parent0812f5a40a0a190172b6de6e91755b882472ddc5
Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'

* commit '0812f5a40a0a190172b6de6e91755b882472ddc5':
  mjpegenc: write the JFIF header if the sample aspect ratio is set

Conflicts:
libavcodec/mjpegenc.c

See: f3ce748d3453a490f32a5518f9cf6bef6892a30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegenc.c