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>

diff --cc libavcodec/ljpegenc.c
index e697b18e7ea6fee5797e63c111fc8417e901cc97,da39a0dc8520a9702a1cc658fb2ecb26b06c980c..7fa5e8ee36f75d54b94320aa60ca0091d64d277d
--- 1/libavcodec/ljpegenc.c
--- 2/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@@ -114,15 -111,9 +114,15 @@@ static int ljpeg_encode_frame(AVCodecCo
                  top[i]= left[i]= topleft[i]= buffer[0][i];
              }
              for(x = 0; x < width; x++) {
 -                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;
 +                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++) {
                      int pred, diff;

diff --cc libavcodec/mjpegenc.c
index 05efe3b1380dfd5251d1acd832be2d9a8ae21e02,30433c3ff6a82877e36e34fd9dcfd17b3bb7d567..e961ba5dbf685311493237d5dd1ae1bef090d57e
--- 1/libavcodec/mjpegenc.c
--- 2/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@@ -215,10 -184,9 +215,10 @@@ void ff_mjpeg_encode_picture_header(AVC
  
      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_BGR24) {
++        (   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] =
          vsample[1] = hsample[1] =
          vsample[2] = hsample[2] = 1;