summaryrefslogtreecommitdiff
path: root/libavformat/subtitles.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-10-29 01:32:44 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2014-10-29 01:32:44 +0100
commit19a6431ec247e4842236292cc5f8cfc8f87da11e (patch)
tree6b2dbcbc3533fec685d825e723b9d237dbfa79b0 /libavformat/subtitles.h
parent26122145559f55b6061281bd96a66cebdc5ac33f (diff)
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.
Diffstat (limited to 'libavformat/subtitles.h')
-rw-r--r--libavformat/subtitles.h4
1 files changed, 3 insertions, 1 deletions
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.