Changeset 5198 for pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

Timestamp:

Nov 10, 2015 5:28:47 AM (9 years ago)

Author:

riza

Message:

Re #1897: Implement support to Ffmpeg 2.8.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c

@@ -195 +195 @@
      * may be needed for post-decoding.
      */
-    enum PixelFormat                 expected_dec_fmt;
+    enum AVPixelFormat               expected_dec_fmt;
                                                 /**< Expected output format of 
                                                      ffmpeg decoder         */
@@ -674 +674 @@
             unsigned raw_fmt_cnt = 0;
             unsigned raw_fmt_cnt_should_be = 0;
-            const enum PixelFormat *p = c->pix_fmts;
+            const enum AVPixelFormat *p = c->pix_fmts;
 
             for(;(p && *p != -1) &&
@@ -1097 +1097 @@
                                      pj_mutex_t *ff_mutex)
 {
-    enum PixelFormat pix_fmt;
+    enum AVPixelFormat pix_fmt;
     pjmedia_video_format_detail *vfd;
     pj_bool_t enc_opened = PJ_FALSE, dec_opened = PJ_FALSE;
@@ -1430 +1430 @@
     PJ_ASSERT_RETURN(ff->enc_ctx, PJ_EINVALIDOP);
 
-    avcodec_get_frame_defaults(&avframe);
+    pj_bzero(&avframe, sizeof(avframe));
+    av_frame_unref(&avframe);
 
     // Let ffmpeg manage the timestamps
@@ -1680 +1681 @@
      * closed).
      */
-    avcodec_get_frame_defaults(&avframe);
+    pj_bzero(&avframe, sizeof(avframe));
+    av_frame_unref(&avframe);
 
     /* Init packet, the container of the encoded data */