ff_ffplay: merge:4fdcd2f1889a79155d5c182c836b9ba968b1eca9

	ffplay: remove unused viddec_width/viddec_height
Reviewed-by: NJosh de Kock <josh@itanimul.li>
Signed-off-by: NMarton Balint <cus@passwd.hu>

ijkmedia/ijkplayer/ff_ffplay.c

@@ -1279,11 +1279,6 @@ static int get_video_frame(FFPlayer *ffp, AVFrame *frame)
 
         frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame);
 
-#ifdef FFP_MERGE
-        is->viddec_width  = frame->width;
-        is->viddec_height = frame->height;
-#endif
-
         if (ffp->framedrop>0 || (ffp->framedrop && get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER)) {
             if (frame->pts != AV_NOPTS_VALUE) {
                 double diff = dpts - get_master_clock(is);
@@ -2289,11 +2284,6 @@ static int stream_component_open(FFPlayer *ffp, int stream_index)
         is->video_stream = stream_index;
         is->video_st = ic->streams[stream_index];
 
-#ifdef FFP_MERGE
-        is->viddec_width  = avctx->width;
-        is->viddec_height = avctx->height;
-#endif
-
         decoder_init(&is->viddec, avctx, &is->videoq, is->continue_read_thread);
         ffp->node_vdec = ffpipeline_open_video_decoder(ffp->pipeline, ffp);
         if (!ffp->node_vdec)

ijkmedia/ijkplayer/ff_ffplay_def.h

@@ -283,9 +283,6 @@ typedef struct VideoState {
     Decoder viddec;
 #ifdef FFP_MERGE
     Decoder subdec;
-
-    int viddec_width;
-    int viddec_height;
 #endif
 
     int audio_stream;