Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'

* commit '0cdbc4d39394965bd8712395b19160da8f3fe144':
  ljpegenc: rename the encoding function.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/ljpegenc.c
index 514d493,4bb6bbf..e697b18
--- 1/libavcodec/ljpegenc.c
--- 2/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@@ -304,11 -289,14 +304,11 @@@ AVCodec ff_ljpeg_encoder = 
      .id             = AV_CODEC_ID_LJPEG,
      .priv_data_size = sizeof(LJpegEncContext),
      .init           = ljpeg_encode_init,
-     .encode2        = encode_picture_lossless,
+     .encode2        = ljpeg_encode_frame,
      .close          = ljpeg_encode_close,
 -    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ420P,
 -                                                    AV_PIX_FMT_YUVJ422P,
 -                                                    AV_PIX_FMT_YUVJ444P,
 -                                                    AV_PIX_FMT_BGRA,
 -                                                    AV_PIX_FMT_YUV420P,
 -                                                    AV_PIX_FMT_YUV422P,
 -                                                    AV_PIX_FMT_YUVJ444P,
 -                                                    AV_PIX_FMT_NONE },
 +    .pix_fmts       = (const enum AVPixelFormat[]){
 +        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},
  };