updated ffmpeg

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2109 10f7b99b-c216-0410-bff0-8a66a9350fd8

4 files changed, 4 insertions, 5 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c
index db856ea0c..f18764303 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c
@@ -1841,7 +1841,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
             h->prev_frame_num++;

             h->prev_frame_num %= 1<<h->sps.log2_max_frame_num;

             s->current_picture_ptr->frame_num= h->prev_frame_num;

-            ff_h264_execute_ref_pic_marking(h, NULL, 0);

+            ff_generate_sliding_window_mmcos(h);

+            ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index);

         }

 

         /* See if we have a decoded first field looking for a pair... */

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h
index 915a1314f..f9874a124 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.h
@@ -1275,7 +1275,7 @@ static inline int get_dct8x8_allowed(H264Context *h){
 /**

  * decodes a P_SKIP or B_SKIP macroblock

  */

-static void decode_mb_skip(H264Context *h){

+static void av_unused decode_mb_skip(H264Context *h){

     MpegEncContext * const s = &h->s;

     const int mb_xy= h->mb_xy;

     int mb_type=0;

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c
index 6a97c9d75..92fd97fa8 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264_refs.c
@@ -478,6 +478,7 @@ void ff_generate_sliding_window_mmcos(H264Context *h) {
     MpegEncContext * const s = &h->s;

     assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);

 

+    h->mmco_index= 0;

     if(h->short_ref_count && h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&

             !(FIELD_PICTURE && !s->first_field && s->current_picture_ptr->reference)) {

         h->mmco[0].opcode= MMCO_SHORT2UNUSED;

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/utils.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/utils.c
index e1805779e..c748770e2 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/utils.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/utils.c
@@ -37,9 +37,6 @@
 #include <stdarg.h>

 #include <limits.h>

 #include <float.h>

-#if defined(__MINGW32__) || __STDC_VERSION__ < 199901L

-#include <fcntl.h>

-#endif

 

 //static int volatile entangled_thread_counter=0; /* ffdshow custom comment out */

 int (*ff_lockmgr_cb)(void **mutex, enum AVLockOp op);