Add support for picture_ptr field in MJpegDecodeContext
authoranatoly <anatoly.nenashev@ovsoft.ru>
Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 20:28:40 +0000 (21:28 +0100)
commitf448478a311f2650e0bc48c79c67f2114d898919
tree66f1fb81f08a12483417afcecc09d852aed657aa
parent82ec6183bcad7d88e3ce0f9d3c9c6a4ed17b13f8
Add support for picture_ptr field in MJpegDecodeContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297bae5144f23fd4b46a1309857040b63)

Conflicts:

libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2fade10cb0c53e6b2a663d8ce0566ba7c61013cf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeglsdec.c
libavcodec/mjpegdec.c