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>
Mon, 9 Dec 2013 11:24:50 +0000 (12:24 +0100)
commit2fade10cb0c53e6b2a663d8ce0566ba7c61013cf
tree7adbfd6017697ae7220c80c03a29fee26500de35
parent9eac7c435f9c9dfc7ed4bbc8ec5a4bc710b486f2
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>
libavcodec/jpeglsdec.c
libavcodec/mjpegdec.c