Merge svn changes up to r27573

Conflicts:
	libmpcodecs/vd_ffmpeg.c

2 files changed, 26 insertions, 6 deletions

diff --git a/libass/ass.c b/libass/ass.c
index 1ee81773b3..8022dfc9be 100644
--- a/libass/ass.c
+++ b/libass/ass.c
@@ -717,21 +717,33 @@ static int process_text(ass_track_t* track, char* str)
 }
 
 /**
- * \brief Process CodecPrivate section of subtitle stream
+ * \brief Process a chunk of subtitle stream data.
  * \param track track
  * \param data string to parse
  * \param size length of data
- CodecPrivate section contains [Stream Info] and [V4+ Styles] ([V4 Styles] for SSA) sections
-*/ 
-void ass_process_codec_private(ass_track_t* track, char *data, int size)
+*/
+void ass_process_data(ass_track_t* track, char* data, int size)
 {
 	char* str = malloc(size + 1);
 
 	memcpy(str, data, size);
 	str[size] = '\0';
 
+	mp_msg(MSGT_ASS, MSGL_V, "event: %s\n", str);
 	process_text(track, str);
 	free(str);
+}
+
+/**
+ * \brief Process CodecPrivate section of subtitle stream
+ * \param track track
+ * \param data string to parse
+ * \param size length of data
+ CodecPrivate section contains [Stream Info] and [V4+ Styles] ([V4 Styles] for SSA) sections
+*/
+void ass_process_codec_private(ass_track_t* track, char *data, int size)
+{
+	ass_process_data(track, data, size);
 
 	if (!track->event_format) {
 		// probably an mkv produced by ancient mkvtoolnix
@@ -1009,7 +1021,7 @@ ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize,
 	return track;
 }
 
-char* read_file_recode(char* fname, char* codepage, int* size)
+char* read_file_recode(char* fname, char* codepage, size_t* size)
 {
 	char* buf;
 	size_t bufsize;
diff --git a/libass/ass.h b/libass/ass.h
index baa52ead0c..4bdea3a4aa 100644
--- a/libass/ass.h
+++ b/libass/ass.h
@@ -154,6 +154,14 @@ void ass_free_style(ass_track_t* track, int sid);
 void ass_free_event(ass_track_t* track, int eid);
 
 /**
+ * \brief Parse a chunk of subtitle stream data.
+ * \param track track
+ * \param data string to parse
+ * \param size length of data
+ */
+void ass_process_data(ass_track_t* track, char* data, int size);
+
+/**
  * \brief Parse Codec Private section of subtitle stream
  * \param track target track
  * \param data string to parse
@@ -171,7 +179,7 @@ void ass_process_codec_private(ass_track_t* track, char *data, int size);
 */
 void ass_process_chunk(ass_track_t* track, char *data, int size, long long timecode, long long duration);
 
-char* read_file_recode(char* fname, char* codepage, int* size);
+char* read_file_recode(char* fname, char* codepage, size_t* size);
 
 /**
  * \brief Read subtitles from file.