diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:48:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:48:20 +0100 |
| commit | fb98ca575d64452dba55a60c4ddf571163f0ca81 (patch) | |
| tree | 462efba501471ae7d9c4d8a634429724f614ceff /libavcodec/mjpegenc.c | |
| parent | 6f7dbb9cc1f1703f0be5c922fd1860e2b5363caa (diff) | |
| parent | daffed3b173c59d64907747bf3309e98a8974f4e (diff) | |
| download | ffmpeg-streaming-fb98ca575d64452dba55a60c4ddf571163f0ca81.zip ffmpeg-streaming-fb98ca575d64452dba55a60c4ddf571163f0ca81.tar.gz | |
Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'
* commit 'daffed3b173c59d64907747bf3309e98a8974f4e':
ljpegenc: accept bgr24 instead of bgra
Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
Only whitespace merged, we continue to support both formats
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.c')
| -rw-r--r-- | libavcodec/mjpegenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 05efe3b..e961ba5 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -216,7 +216,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift); if (avctx->codec->id == AV_CODEC_ID_LJPEG && - (avctx->pix_fmt == AV_PIX_FMT_BGR0 + ( avctx->pix_fmt == AV_PIX_FMT_BGR0 || avctx->pix_fmt == AV_PIX_FMT_BGRA || avctx->pix_fmt == AV_PIX_FMT_BGR24)) { vsample[0] = hsample[0] = |
