[FFmpeg-cvslog] ffmpeg_filter: Add missing pixel formats to strict_std_compliance case for ljpeg

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Feb 10 12:28:12 2016 +0100| [82d2aa2b32e8971e749fd776233ba74df659404c] | committer: Michael Niedermayer

ffmpeg_filter: Add missing pixel formats to strict_std_compliance case for ljpeg

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 ffmpeg_filter.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index b049c48..7f1ee1b 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -50,8 +50,10 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCod
               AV_PIX_FMT_YUV420P,  AV_PIX_FMT_YUV422P,  AV_PIX_FMT_YUV444P,
               AV_PIX_FMT_NONE };
         static const enum AVPixelFormat ljpeg_formats[] =
-            { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV420P,
-              AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_BGRA, AV_PIX_FMT_NONE };
+            { AV_PIX_FMT_BGR24   , AV_PIX_FMT_BGRA    , AV_PIX_FMT_BGR0,
+              AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P,
+              AV_PIX_FMT_YUV420P , AV_PIX_FMT_YUV444P , AV_PIX_FMT_YUV422P,
+              AV_PIX_FMT_NONE};
 
         if (enc_ctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
             if (enc_ctx->codec_id == AV_CODEC_ID_MJPEG) {