From 02f96efc509021d3dccea635044580199ddd0665 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 23 Nov 2013 21:38:39 +0100
Subject: dec_video: remove "initialized" field

It's redundant.
---
 video/decode/dec_video.c | 16 +++++-----------
 video/decode/dec_video.h |  5 +++--
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'video')

diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index cdfbd816a9..f8441f005d 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -115,28 +115,22 @@ void video_reinit_vo(struct dec_video *d_video)
 
 void video_uninit(struct dec_video *d_video)
 {
-    if (d_video->initialized) {
+    if (d_video->vd_driver) {
         mp_tmsg(MSGT_DECVIDEO, MSGL_V, "Uninit video.\n");
         d_video->vd_driver->uninit(d_video);
     }
     talloc_free(d_video->priv);
-    d_video->priv = NULL;
     vf_uninit_filter_chain(d_video->vfilter);
-    d_video->vfilter = NULL;
     talloc_free(d_video);
 }
 
 static int init_video_codec(struct dec_video *d_video, const char *decoder)
 {
-    assert(!d_video->initialized);
-
     if (!d_video->vd_driver->init(d_video, decoder)) {
         mp_tmsg(MSGT_DECVIDEO, MSGL_V, "Video decoder init failed.\n");
-        //uninit_video(d_video);
         return 0;
     }
 
-    d_video->initialized = 1;
     d_video->prev_codec_reordered_pts = MP_NOPTS_VALUE;
     d_video->prev_sorted_pts = MP_NOPTS_VALUE;
     return 1;
@@ -168,9 +162,9 @@ static const struct vd_functions *find_driver(const char *name)
     return NULL;
 }
 
-int video_init_best_codec(struct dec_video *d_video, char* video_decoders)
+bool video_init_best_codec(struct dec_video *d_video, char* video_decoders)
 {
-    assert(!d_video->initialized);
+    assert(!d_video->vd_driver);
 
     struct mp_decoder_entry *decoder = NULL;
     struct mp_decoder_list *list =
@@ -195,7 +189,7 @@ int video_init_best_codec(struct dec_video *d_video, char* video_decoders)
                 "%s:%s\n", sel->family, sel->decoder);
     }
 
-    if (d_video->initialized) {
+    if (d_video->vd_driver) {
         d_video->decoder_desc =
             talloc_asprintf(d_video, "%s [%s:%s]", decoder->desc, decoder->family,
                             decoder->decoder);
@@ -208,7 +202,7 @@ int video_init_best_codec(struct dec_video *d_video, char* video_decoders)
     }
 
     talloc_free(list);
-    return d_video->initialized;
+    return !!d_video->vd_driver;
 }
 
 void *video_decode(struct dec_video *d_video, struct demux_packet *packet,
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index b706910e5b..c9601efb7b 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_DEC_VIDEO_H
 #define MPLAYER_DEC_VIDEO_H
 
+#include <stdbool.h>
+
 #include "demux/stheader.h"
 #include "video/hwdec.h"
 #include "video/mp_image.h"
@@ -34,7 +36,6 @@ struct dec_video {
     long vf_reconfig_count; // incremented each mpcodecs_reconfig_vo() call
     struct mp_image_params *vf_input; // video filter input params
     struct mp_hwdec_info *hwdec_info; // video output hwdec handles
-    int initialized;
     struct sh_stream *header;
 
     char *decoder_desc;
@@ -60,7 +61,7 @@ struct dec_video {
 
 struct mp_decoder_list *video_decoder_list(void);
 
-int video_init_best_codec(struct dec_video *d_video, char* video_decoders);
+bool video_init_best_codec(struct dec_video *d_video, char* video_decoders);
 void video_uninit(struct dec_video *d_video);
 
 struct demux_packet;
-- 
cgit v1.2.3