From 19a6431ec247e4842236292cc5f8cfc8f87da11e Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 29 Oct 2014 01:32:44 +0100 Subject: Print a warning if a subtitle demuxer changes utf16 to utf8. This does not fix anything but gives users a chance to know that they must not pass -sub_charenc UTF-16 to ffmpeg. Fixes ticket #4059. --- libavformat/subtitles.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavformat/subtitles.h') diff --git a/libavformat/subtitles.h b/libavformat/subtitles.h index 903c24d9df..eb719ea770 100644 --- a/libavformat/subtitles.h +++ b/libavformat/subtitles.h @@ -49,14 +49,16 @@ typedef struct { * Initialize the FFTextReader from the given AVIOContext. This function will * read some bytes from pb, and test for UTF-8 or UTF-16 BOMs. Further accesses * to FFTextReader will read more data from pb. + * If s is not NULL, the user will be warned if a UTF-16 conversion takes place. * * The purpose of FFTextReader is to transparently convert read data to UTF-8 * if the stream had a UTF-16 BOM. * + * @param s Pointer to provide av_log context * @param r object which will be initialized * @param pb stream to read from (referenced as long as FFTextReader is in use) */ -void ff_text_init_avio(FFTextReader *r, AVIOContext *pb); +void ff_text_init_avio(void *s, FFTextReader *r, AVIOContext *pb); /** * Similar to ff_text_init_avio(), but sets it up to read from a bounded buffer. -- cgit v1.2.3