summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2009-11-13 19:40:58 +0000
committerjstebbins <[email protected]>2009-11-13 19:40:58 +0000
commitc5f57ad425252fb897cf57d7fd786f5b757fb0c3 (patch)
tree2013377a8c5da954756eb396f674ae1455398b5f
parent63554782ac6cab43dce1222150500b38ea589655 (diff)
fix lockup in reader when importing srt's
The subitle id for srt's was not being set. This caused the reader to mistakenly select the subtitle's fifo when processing audio data and stuff audio into it, filling it very rapidly. Sync would not remove items from the subtitle fifo because the corresponding video timestamp hadn't arrived yet. And since reader was waiting on a full subtitle fifo, no more video would ever arive at sync. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2926 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libhb/common.c b/libhb/common.c
index 1da836ece..52ea27f66 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -880,6 +880,7 @@ int hb_srt_add( const hb_job_t * job,
subtitle = calloc( 1, sizeof( *subtitle ) );
+ subtitle->id = (hb_list_count(job->list_subtitle) << 8) | 0xFF;
subtitle->format = TEXTSUB;
subtitle->source = SRTSUB;