Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 11:32:37 +0000 (12:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 11:42:10 +0000 (12:42 +0100)
commit639303867640d1880fad675472bc47e9c95f96c7
treeb8f3de370c8d29bc6498b58a250fbdab375f91b4
parent2fade10cb0c53e6b2a663d8ce0566ba7c61013cf
parente2274aa555f023e4f4e4819bf29b2d7e0adec7d5
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'

* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
  mjpegdec: use the AVFrame API properly.

Conflicts:
libavcodec/mjpegdec.c

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