diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 14:30:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 14:45:44 +0200 |
| commit | 91af76099e0649a26a411d3f704a826840006296 (patch) | |
| tree | 900300e9e23c6cb8efbe2772113c5ca29cdfe6f9 /libavcodec/dvbsub.c | |
| parent | 4aade44c4aea69ca40b926682f84635b1e84b47f (diff) | |
| parent | 23aae62c2cb4504a09ceb8cd0cabc1c8b260f521 (diff) | |
| download | ffmpeg-91af76099e0649a26a411d3f704a826840006296.tar.gz | |
Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'
* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
alsdec: Check k used for rice decoder.
avfiltergraph: silence an uninitialized variable warning
xsubenc: reindent
lavc: replace AVCodecContext.encode with subtitle-specific callback
lavc: add const to private codec class initialization.
avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
id3v2: strdup the genre name explicitly.
lavf/id3v2: do not export empty fields.
buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
lavfi: replace empty input/output lists with null pointers
Conflicts:
ffmpeg_filter.c
libavcodec/alsdec.c
libavcodec/dvdsubenc.c
libavcodec/utils.c
libavcodec/v210dec.h
libavfilter/af_channelsplit.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_ass.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvbsub.c')
| -rw-r--r-- | libavcodec/dvbsub.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index 37bb3e1ec0..562db6a586 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -248,7 +248,7 @@ static void dvb_encode_rle8(uint8_t **pq, } static int encode_dvb_subtitles(DVBSubtitleContext *s, - uint8_t *outbuf, AVSubtitle *h) + uint8_t *outbuf, const AVSubtitle *h) { uint8_t *q, *pseg_len; int page_id, region_id, clut_id, object_id, i, bpp_index, page_state; @@ -444,10 +444,10 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, } static int dvbsub_encode(AVCodecContext *avctx, - unsigned char *buf, int buf_size, void *data) + unsigned char *buf, int buf_size, + const AVSubtitle *sub) { DVBSubtitleContext *s = avctx->priv_data; - AVSubtitle *sub = data; int ret; ret = encode_dvb_subtitles(s, buf, sub); @@ -459,6 +459,6 @@ AVCodec ff_dvbsub_encoder = { .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_DVB_SUBTITLE, .priv_data_size = sizeof(DVBSubtitleContext), - .encode = dvbsub_encode, + .encode_sub = dvbsub_encode, .long_name = NULL_IF_CONFIG_SMALL("DVB subtitles"), }; |