diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:38:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:38:30 +0100 |
| commit | 6f7dbb9cc1f1703f0be5c922fd1860e2b5363caa (patch) | |
| tree | 89f09141b8aaa2d6797343562a01d6edccc82228 /libavcodec/ljpegenc.c | |
| parent | 6deaab360c9c79e686265c99b9f9afc1d0068a8f (diff) | |
| parent | 0cdbc4d39394965bd8712395b19160da8f3fe144 (diff) | |
Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'
* commit '0cdbc4d39394965bd8712395b19160da8f3fe144':
ljpegenc: rename the encoding function.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ljpegenc.c')
| -rw-r--r-- | libavcodec/ljpegenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 514d49315f..e697b18e7e 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -57,8 +57,8 @@ typedef struct LJpegEncContext { uint16_t (*scratch)[4]; } LJpegEncContext; -static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, - const AVFrame *pict, int *got_packet) +static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) { LJpegEncContext *s = avctx->priv_data; PutBitContext pb; @@ -304,7 +304,7 @@ 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_BGR24 , AV_PIX_FMT_BGRA , AV_PIX_FMT_BGR0, |