summaryrefslogtreecommitdiffstats
path: root/av_sub.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-14 14:05:22 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-15 18:45:43 +0200
commitac79632ded16b62e0abf10f1cd319fba20bc0024 (patch)
treea671e3fe3971917f2dbf066395b90598320b3df1 /av_sub.h
parente9022ec470e9334a6d0f3cb044027964ac4f63f6 (diff)
downloadmpv-ac79632ded16b62e0abf10f1cd319fba20bc0024.tar.bz2
mpv-ac79632ded16b62e0abf10f1cd319fba20bc0024.tar.xz
subtitles: remove code trying to handle text subs with libavcodec
The avsub implementation tries to fall back to MPlayer's other text subtitle decoding if libavcodec returns text as the 'decoded' subtitle. The code implementing this is buggy, and as far as I can see it should not be triggered normally (libavcodec decoding is only used for xvid, pgs and dvb subtitles, and for those libavcodec should return bitmaps). Remove the buggy code (don't try to support non-bitmap results) and simplify things a bit.
Diffstat (limited to 'av_sub.h')
-rw-r--r--av_sub.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/av_sub.h b/av_sub.h
index 690ed6c1f1..af3edc4d34 100644
--- a/av_sub.h
+++ b/av_sub.h
@@ -24,7 +24,7 @@
struct sh_sub;
void reset_avsub(struct sh_sub *sh);
-int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size,
- double *pts, double *endpts);
+int decode_avsub(struct sh_sub *sh, uint8_t *data, int size,
+ double pts, double endpts);
#endif /* MPLAYER_AV_SUB_H */