[FFmpeg-cvslog] avcodec/xbmdec: support X10 format

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 05:34:25 2014 +0100| [1da186676738dbded75a83d72f0739b993970d4e] | committer: Michael Niedermayer

avcodec/xbmdec: support X10 format

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1da186676738dbded75a83d72f0739b993970d4e
---

 libavcodec/xbmdec.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c
index 52b41ee..203c2f9 100644
--- a/libavcodec/xbmdec.c
+++ b/libavcodec/xbmdec.c
@@ -95,6 +95,13 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
                 if (av_isxdigit(*ptr))
                     val = (val << 4) + convert(*ptr++);
                 *dst++ = ff_reverse[val];
+                if (av_isxdigit(*ptr) && j+1 < linesize) {
+                    j++;
+                    val = convert(*ptr++);
+                    if (av_isxdigit(*ptr))
+                        val = (val << 4) + convert(*ptr++);
+                    *dst++ = ff_reverse[val];
+                }
             } else {
                 av_log(avctx, AV_LOG_ERROR,
                        "Unexpected data at %.8s.\n", ptr);