Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/48/merge
Michael Niedermayer 11 years ago
parent 6deaab360c 0cdbc4d393
commit 6f7dbb9cc1
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/ljpegenc.c

6
libavcodec/ljpegenc.c
Unescape View File

@ -57,8 +57,8 @@ typedef struct LJpegEncContext {
uint16_t (*scratch)[4]; uint16_t (*scratch)[4];
} LJpegEncContext; } LJpegEncContext;
static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
LJpegEncContext *s = avctx->priv_data; LJpegEncContext *s = avctx->priv_data;
PutBitContext pb; PutBitContext pb;
@ -304,7 +304,7 @@ AVCodec ff_ljpeg_encoder = {
.id = AV_CODEC_ID_LJPEG, .id = AV_CODEC_ID_LJPEG,
.priv_data_size = sizeof(LJpegEncContext), .priv_data_size = sizeof(LJpegEncContext),
.init = ljpeg_encode_init, .init = ljpeg_encode_init,
.encode2 = encode_picture_lossless, .encode2 = ljpeg_encode_frame,
.close = ljpeg_encode_close, .close = ljpeg_encode_close,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_BGR24 , AV_PIX_FMT_BGRA , AV_PIX_FMT_BGR0, AV_PIX_FMT_BGR24 , AV_PIX_FMT_BGRA , AV_PIX_FMT_BGR0,

Write Preview
Loading…
Cancel
Save