summaryrefslogtreecommitdiff
path: root/libavcodec/rv10enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-20 00:47:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-20 01:29:30 +0100
commitbe2e211dce2964f922e5dee54a7569ebd6efb0da (patch)
treea1b6e3a9f5b577230d8c9c2b5b5bcba289ee79f5 /libavcodec/rv10enc.c
parentf4f386dd00e594dc90eb32ae872ae8e22b08d179 (diff)
parent6b8b0fe2bc57fdd606074e52ba73cd9b3d95e644 (diff)
downloadffmpeg-be2e211dce2964f922e5dee54a7569ebd6efb0da.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: doxy: remove reference to removed api examples: unbreak compilation ttadec: cosmetics: reindent sunrast: use RLE trigger macro inplace of the hard coded value. sunrastenc: set keyframe flag for the output packet. mpegvideo_enc: switch to encode2(). mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0 Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv10enc.c')
-rw-r--r--libavcodec/rv10enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv10enc.c b/libavcodec/rv10enc.c
index 81f4b94933..add7855b7f 100644
--- a/libavcodec/rv10enc.c
+++ b/libavcodec/rv10enc.c
@@ -62,7 +62,7 @@ AVCodec ff_rv10_encoder = {
.id = CODEC_ID_RV10,
.priv_data_size = sizeof(MpegEncContext),
.init = ff_MPV_encode_init,
- .encode = ff_MPV_encode_picture,
+ .encode2 = ff_MPV_encode_picture,
.close = ff_MPV_encode_end,
.pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
.long_name= NULL_IF_CONFIG_SMALL("RealVideo 1.0"),