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/assenc.c | |
| parent | 9f64c8219ada4bd48927abaa5eebd7ff9ba95f61 (diff) | |
| download | ffmpeg-streaming-466b39efaf09adecc7314eaba5904b0ee8442528.zip ffmpeg-streaming-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/assenc.c')
| -rw-r--r-- | libavcodec/assenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index 6b44623..caf266e 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -37,9 +37,9 @@ static av_cold int ass_encode_init(AVCodecContext *avctx) } static int ass_encode_frame(AVCodecContext *avctx, - unsigned char *buf, int bufsize, void *data) + unsigned char *buf, int bufsize, + const AVSubtitle *sub) { - AVSubtitle *sub = data; int i, len, total_len = 0; for (i=0; i<sub->num_rects; i++) { @@ -67,5 +67,5 @@ AVCodec ff_ass_encoder = { .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_SSA, .init = ass_encode_init, - .encode = ass_encode_frame, + .encode_sub = ass_encode_frame, }; |
