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 | |
| parent | 6f7dbb9cc1f1703f0be5c922fd1860e2b5363caa (diff) | |
| parent | daffed3b173c59d64907747bf3309e98a8974f4e (diff) | |
| download | ffmpeg-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>
| -rw-r--r-- | libavcodec/ljpegenc.c | 12 | ||||
| -rw-r--r-- | libavcodec/mjpegenc.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index e697b18e7e..7fa5e8ee36 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -115,13 +115,13 @@ static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } for(x = 0; x < width; x++) { if(avctx->pix_fmt == AV_PIX_FMT_BGR24){ - buffer[x][1] = ptr[3*x+0] - ptr[3*x+1] + 0x100; - buffer[x][2] = ptr[3*x+2] - ptr[3*x+1] + 0x100; - buffer[x][0] = (ptr[3*x+0] + 2*ptr[3*x+1] + ptr[3*x+2])>>2; + buffer[x][1] = ptr[3 * x + 0] - ptr[3 * x + 1] + 0x100; + buffer[x][2] = ptr[3 * x + 2] - ptr[3 * x + 1] + 0x100; + buffer[x][0] = (ptr[3 * x + 0] + 2 * ptr[3 * x + 1] + ptr[3 * x + 2]) >> 2; }else{ - buffer[x][1] = ptr[4*x+0] - ptr[4*x+1] + 0x100; - buffer[x][2] = ptr[4*x+2] - ptr[4*x+1] + 0x100; - buffer[x][0] = (ptr[4*x+0] + 2*ptr[4*x+1] + ptr[4*x+2])>>2; + buffer[x][1] = ptr[4 * x + 0] - ptr[4 * x + 1] + 0x100; + buffer[x][2] = ptr[4 * x + 2] - ptr[4 * x + 1] + 0x100; + buffer[x][0] = (ptr[4 * x + 0] + 2 * ptr[4 * x + 1] + ptr[4 * x + 2]) >> 2; } for(i=0;i<3;i++) { diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 05efe3b138..e961ba5dbf 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] = |