diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-18 16:41:24 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-09-17 15:48:20 +0200 |
| commit | 466b39efaf09adecc7314eaba5904b0ee8442528 (patch) | |
| tree | aeb8839317065d0df14454019d13f96ad77f1d92 /libavcodec/utils.c | |
| parent | 9f64c8219ada4bd48927abaa5eebd7ff9ba95f61 (diff) | |
| download | ffmpeg-466b39efaf09adecc7314eaba5904b0ee8442528.tar.gz | |
lavc: replace AVCodecContext.encode with subtitle-specific callback
AVCodecContext.encode is currently used only for subtitles, encode2 is
used for audio and video.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 23ac50038f..f56dd7b793 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -115,7 +115,7 @@ static void avcodec_init(void) int av_codec_is_encoder(const AVCodec *codec) { - return codec && (codec->encode || codec->encode2); + return codec && (codec->encode_sub || codec->encode2); } int av_codec_is_decoder(const AVCodec *codec) @@ -1174,7 +1174,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, } if(sub->num_rects == 0 || !sub->rects) return -1; - ret = avctx->codec->encode(avctx, buf, buf_size, sub); + ret = avctx->codec->encode_sub(avctx, buf, buf_size, sub); avctx->frame_number++; return ret; } |