From f9dbc186eb218134e187a32d4eaa3054cd4a0c34 Mon Sep 17 00:00:00 2001
From: James Stembridge <jstembridge@users.sourceforge.net>
Date: Sun, 12 Sep 2004 15:43:23 +0000
Subject: Unbreak ffmpeg mpeg-1/2 decoding

CVS patchset: 6963
CVS date: 2004/09/12 15:43:23
---
 src/libffmpeg/video_decoder.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index add979783..4b2a4249d 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_decoder.c,v 1.28 2004/09/11 20:52:17 jstembridge Exp $
+ * $Id: video_decoder.c,v 1.29 2004/09/12 15:43:23 jstembridge Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -882,8 +882,8 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
       init_video_codec(this);
     }
   
-    if (this->decoder_ok && 
-        ((buf->decoder_flags & BUF_FLAG_FRAME_END) || this->is_mpeg12)) {
+    if (this->is_mpeg12 ||
+        (this->decoder_ok && (buf->decoder_flags & BUF_FLAG_FRAME_END))) {
 
       vo_frame_t *img;
       int         free_img;
-- 
cgit v1.2.3