Revise for newer ffmpeg versions

Author: Mr-Dave

src/movie.cpp

@@ -315,10 +315,7 @@ static int movie_encode_video(ctx_movie *movie)
         // Encoder did not provide metadata, set it up manually
         movie->pkt->size = retcd;
         movie->pkt->data = video_outbuf;
-
-        if (movie->picture->key_frame == 1) {
-            movie->pkt->flags |= AV_PKT_FLAG_KEY;
-        }
+        myframe_key(movie->picture);
 
         movie->pkt->pts = movie->picture->pts;
         movie->pkt->dts = movie->pkt->pts;
@@ -1445,11 +1442,10 @@ int movie_put_image(ctx_movie *movie, ctx_image_data *img_data, const struct tim
         movie->gop_cnt ++;
         if (movie->gop_cnt == movie->ctx_codec->gop_size ) {
             movie->picture->pict_type = AV_PICTURE_TYPE_I;
-            movie->picture->key_frame = 1;
+            myframe_key(movie->picture);
             movie->gop_cnt = 0;
         } else {
             movie->picture->pict_type = AV_PICTURE_TYPE_P;
-            movie->picture->key_frame = 0;
         }
 
         /* A return code of -2 is thrown by the put_frame

src/util.cpp

@@ -713,7 +713,14 @@ char* mytranslate_text(const char *msgid, int setnls)
  *  These are designed to be extremely simple version specific
  *  variants of the libav functions.
  ****************************************************************************/
-
+void myframe_key(AVFrame *frame)
+{
+    #if (MYFFVER < 60016)
+        frame->key_frame = 1;
+    #else
+        frame->flags |= AV_FRAME_FLAG_KEY;
+    #endif
+}
 /*********************************************/
 AVFrame *myframe_alloc(void)
 {

src/util.hpp

@@ -78,6 +78,12 @@
     typedef AVCodec myAVCodec; /* Version independent definition for AVCodec*/
 #endif
 
+#if (MYFFVER <= 60016)
+    typedef uint8_t myuint;         /* Version independent uint */
+#else
+    typedef const uint8_t myuint;   /* Version independent uint */
+#endif
+
 #ifdef HAVE_GETTEXT
     #include <libintl.h>
     extern int  _nl_msg_cat_cntr;    /* Required for changing the locale dynamically */
@@ -128,6 +134,7 @@
     void mytrim(std::string &parm);
     void myunquote(std::string &parm);
 
+    void myframe_key(AVFrame *frame);
     AVFrame *myframe_alloc(void);
     void myframe_free(AVFrame *frame);
     void mypacket_free(AVPacket *pkt);

src/webu_mpegts.cpp

@@ -70,7 +70,7 @@ static int webu_mpegts_pic_send(ctx_webui *webui, unsigned char *img)
         webui->picture->height = webui->ctx_codec->height;
 
         webui->picture->pict_type = AV_PICTURE_TYPE_I;
-        webui->picture->key_frame = 1;
+        myframe_key(webui->picture);
         webui->picture->pts = 1;
     }
 
@@ -198,7 +198,7 @@ static int webu_mpegts_getimg(ctx_webui *webui)
     return 0;
 }
 
-static int webu_mpegts_avio_buf(void *opaque, uint8_t *buf, int buf_size)
+static int webu_mpegts_avio_buf(void *opaque, myuint *buf, int buf_size)
 {
     ctx_webui *webui =(ctx_webui *)opaque;