ff_ffplay: fix spell error introduced in de0927d6

ijkmedia/ijkplayer/ff_ffplay.c

@@ -1193,7 +1193,7 @@ static int queue_picture(FFPlayer *ffp, AVFrame *src_frame, double pts, double d
         return -1;
 
     vp->sar = src_frame->sample_aspect_ratio;
-#if FFP_MERGE
+#ifdef FFP_MERGE
     vp->uploaded = 0;
 #endif
 

ijkmedia/ijkplayer/ff_ffplay_def.h

@@ -192,7 +192,7 @@ typedef struct Frame {
     double pts;           /* presentation timestamp for the frame */
     double duration;      /* estimated duration of the frame */
     int64_t pos;          /* byte position of the frame in the input file */
-#ifdef FF_MERGE
+#ifdef FFP_MERGE
     SDL_Texture *bmp;
 #else
     SDL_VoutOverlay *bmp;
@@ -202,7 +202,7 @@ typedef struct Frame {
     int height;
     int format;
     AVRational sar;
-#ifdef FF_MERGE
+#ifdef FFP_MERGE
     int uploaded;
 #endif
 } Frame;