Browse Source

Merge pull request #533 from sorayuki/patch-1

libff: Fix a race condition crash when handling clocks
Gol-D-Ace 9 years ago
parent
commit
674706ac6e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      deps/libff/libff/ff-demuxer.c

+ 2 - 2
deps/libff/libff/ff-demuxer.c

@@ -344,15 +344,15 @@ void ff_demuxer_reset(struct ff_demuxer *demuxer)
 	packet.clock = clock;
 
 	if (demuxer->audio_decoder != NULL) {
+		ff_clock_retain(clock);
 		packet_queue_put(&demuxer->audio_decoder->packet_queue,
 				&packet);
-		ff_clock_retain(clock);
 	}
 
 	if (demuxer->video_decoder != NULL) {
+		ff_clock_retain(clock);
 		packet_queue_put(&demuxer->video_decoder->packet_queue,
 				&packet);
-		ff_clock_retain(clock);
 	}
 }