diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 00:49:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 01:34:37 +0100 |
commit | 6cb2085278bdd3ee83d5ed528d98c78756ee7277 (patch) | |
tree | da57b6491e07c2deb9cf57e3cd595323d118c244 /libavcodec/mjpegenc.c | |
parent | 8812c97b98321f82763b7c9c1363c7c1f6cace8f (diff) | |
parent | 210f72845c11fbab7b913a4f18ffd67e99d2dd4f (diff) | |
download | ffmpeg-streaming-6cb2085278bdd3ee83d5ed528d98c78756ee7277.zip ffmpeg-streaming-6cb2085278bdd3ee83d5ed528d98c78756ee7277.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
ppc: Add ff_ prefix to nonstatic symbols
sh4: Add ff_ prefix to nonstatic symbols
mpegvideo: Add ff_ prefix to nonstatic functions
rtjpeg: Add ff_ prefix to nonstatic symbols
rv: Add ff_ prefix to nonstatic symbols
vp56: Add ff_ prefix to nonstatic symbols
vorbis: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefix to nonstatic symbols
vc1: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefixes to nonstatic symbols
snow: Add ff_ prefix to nonstatic symbols
mpeg12: Add ff_ prefix to nonstatic symbols
mpeg4: Add ff_ prefixes to nonstatic symbols
lagarith: Add ff_ prefix to lag_rac_init
libavcodec: Add ff_ prefix to j_rev_dct*
dsputil: Add ff_ prefix to inv_zigzag_direct16
libavcodec: Prefix fdct_ifast, fdct_ifast248
dsputil: Add ff_ prefix to the dsputil*_init* functions
libavcodec: Add ff_ prefix to some nonstatic symbols
vlc/rl: Add ff_ prefix to the nonstatic symbols
...
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdsp.c
libavcodec/svq3.c
libavcodec/version.h
libavformat/dv.h
libavformat/dvenc.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.c')
-rw-r--r-- | libavcodec/mjpegenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index bddcc0d..f68d269 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -469,7 +469,7 @@ static int amv_encode_picture(AVCodecContext *avctx, pic->data[i] += (pic->linesize[i] * (s->mjpeg_vsample[i] * (8 * s->mb_height -((s->height/V_MAX)&7)) - 1 )); pic->linesize[i] *= -1; } - return MPV_encode_picture(avctx,buf, buf_size, pic); + return ff_MPV_encode_picture(avctx,buf, buf_size, pic); } AVCodec ff_mjpeg_encoder = { @@ -477,9 +477,9 @@ AVCodec ff_mjpeg_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_MJPEG, .priv_data_size = sizeof(MpegEncContext), - .init = MPV_encode_init, - .encode = MPV_encode_picture, - .close = MPV_encode_end, + .init = ff_MPV_encode_init, + .encode = ff_MPV_encode_picture, + .close = ff_MPV_encode_end, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), }; @@ -489,9 +489,9 @@ AVCodec ff_amv_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_AMV, .priv_data_size = sizeof(MpegEncContext), - .init = MPV_encode_init, + .init = ff_MPV_encode_init, .encode = amv_encode_picture, - .close = MPV_encode_end, + .close = ff_MPV_encode_end, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("AMV Video"), }; |