From 5606cf29482b096df7a6b4b515c9ecb3d40fdf89 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 4 Mar 2014 00:28:10 +0100 Subject: sub: use new FFmpeg API to check MicroDVD FPS Before this, it wasn't possible to distinguish MicroDVD subtitles without FPS header, and subtitles with FPS header equal to FFmpeg's fallback FPS. --- demux/stheader.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'demux/stheader.h') diff --git a/demux/stheader.h b/demux/stheader.h index 177bf50b39..573d6ac3c6 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -88,7 +88,8 @@ typedef struct sh_sub { unsigned char *extradata; // extra header data passed from demuxer int extradata_len; int w, h; // mp4 vobsubs - int frame_based; // timestamps are frame-based + double frame_based; // timestamps are frame-based (and this is the + // fallback framerate used for timestamps) bool is_utf8; // if false, subtitle packet charset is unknown struct ass_track *track; // loaded by libass struct dec_sub *dec_sub; // decoder context -- cgit v1.2.3