From 9e2d4f8b7cc4751552c8f4d9a31dbf7ed04c083c Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 11 Dec 2012 19:32:10 -0800
Subject: [PATCH] Avoid potential NULL dereference

---
 apps/openmw/mwrender/videoplayer.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index 46fa4b9e9..612b37c0a 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -142,16 +142,12 @@ namespace MWRender
     }
     double get_audio_clock(VideoState *is) {
         double pts;
-        int hw_buf_size, bytes_per_sec, n;
 
         pts = is->audio_clock; /* maintained in the audio thread */
-        hw_buf_size = is->audio_buf_size - is->audio_buf_index;
-        bytes_per_sec = 0;
-        n = is->audio_st->codec->channels * 2;
         if(is->audio_st) {
-            bytes_per_sec = is->audio_st->codec->sample_rate * n;
-        }
-        if(bytes_per_sec) {
+            int n = is->audio_st->codec->channels * 2;
+            int bytes_per_sec = is->audio_st->codec->sample_rate * n;
+            int hw_buf_size = is->audio_buf_size - is->audio_buf_index;
             pts -= (double)hw_buf_size / bytes_per_sec;
         }
         return pts;