[SCM] libav/experimental: ljpeg: fix duplicated pixel format entry

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2e708f17083fc41f10161f2406d57ec154c75468
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:   Wed Mar 12 15:19:12 2014 +0100

    ljpeg: fix duplicated pixel format entry

diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c
index 7eb4675..7c1b3bc 100644
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@ -329,6 +329,6 @@ AVCodec ff_ljpeg_encoder = {
                                                     AV_PIX_FMT_BGR24,
                                                     AV_PIX_FMT_YUV420P,
                                                     AV_PIX_FMT_YUV422P,
-                                                    AV_PIX_FMT_YUVJ444P,
+                                                    AV_PIX_FMT_YUV444P,
                                                     AV_PIX_FMT_NONE },
 };

-- 
Libav/FFmpeg packaging