Merge branch 'master' into low_quality_intel_crap

Conflicts:
	video/out/gl_video_shaders.glsl
	video/out/vo_opengl.c

1 files changed, 1 insertions, 0 deletions

diff --git a/sub/subreader.h b/sub/subreader.h
index 4584f2366a..7a2316bdf1 100644
--- a/sub/subreader.h
+++ b/sub/subreader.h
@@ -72,6 +72,7 @@ typedef struct subtitle {
 } subtitle;
 
 typedef struct sub_data {
+    const char *codec;
     subtitle *subtitles;
     char *filename;
     int sub_uses_time;