diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:40:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:40:30 +0100 |
| commit | 0f057ea3c5484d7df8a951c1fdeb8b873ae382e2 (patch) | |
| tree | dd8672f17b58a14f57e62437ea8123f77a93f868 /libavcodec/ljpegenc.c | |
| parent | b342ea603f0c767759639a002b9db638231e989c (diff) | |
| parent | 86eb2eaac629909d6ee4067c6f1e485a4e70473d (diff) | |
| download | ffmpeg-0f057ea3c5484d7df8a951c1fdeb8b873ae382e2.tar.gz | |
Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()
Conflicts:
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ljpegenc.c')
| -rw-r--r-- | libavcodec/ljpegenc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index c467d636fd..9316b11cef 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -132,9 +132,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100; if(i==0) - ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly + ff_mjpeg_encode_dc(&s->pb, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly else - ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); + ff_mjpeg_encode_dc(&s->pb, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); } } } @@ -175,9 +175,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, } if(i==0) - ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly + ff_mjpeg_encode_dc(&s->pb, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly else - ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); + ff_mjpeg_encode_dc(&s->pb, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); } } } @@ -187,19 +187,19 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, int x, y, h, v, linesize; h = s->mjpeg_hsample[i]; v = s->mjpeg_vsample[i]; - linesize= p->linesize[i]; + linesize = pict->linesize[i]; for(y=0; y<v; y++){ for(x=0; x<h; x++){ int pred; - ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap + ptr = pict->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); if(i==0) - ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly + ff_mjpeg_encode_dc(&s->pb, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly else - ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); + ff_mjpeg_encode_dc(&s->pb, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); } } } |