diff options
Diffstat (limited to 'contrib/ffmpeg/A01-mpegleak.patch')
| -rw-r--r-- | contrib/ffmpeg/A01-mpegleak.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/ffmpeg/A01-mpegleak.patch b/contrib/ffmpeg/A01-mpegleak.patch index 555be9228..214e9caf9 100644 --- a/contrib/ffmpeg/A01-mpegleak.patch +++ b/contrib/ffmpeg/A01-mpegleak.patch @@ -1,8 +1,8 @@ diff --git a/libavcodec/h264.c b/libavcodec/h264.c -index 2c000a3..93850d6 100644 +index 9889224..041fccf 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c -@@ -3908,7 +3908,7 @@ static int decode_frame(AVCodecContext *avctx, +@@ -3848,7 +3848,7 @@ static int decode_frame(AVCodecContext *avctx, if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ if (avctx->skip_frame >= AVDISCARD_NONREF) return 0; @@ -12,10 +12,10 @@ index 2c000a3..93850d6 100644 } diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c -index a025f7d..eda5e41 100644 +index 1f30916..dce88f3 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c -@@ -628,7 +628,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ +@@ -634,7 +634,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ * stream. Need to discard one frame. Prevents overrun of the * short_ref and long_ref buffers. */ @@ -25,10 +25,10 @@ index a025f7d..eda5e41 100644 "corrupt input), discarding one\n", h->long_ref_count, h->short_ref_count, h->sps.ref_frame_count); diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c -index 4978d28..bb9509f 100644 +index e418e95..87cb73c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c -@@ -986,19 +986,18 @@ int ff_find_unused_picture(MpegEncContext *s, int shared){ +@@ -1004,19 +1004,18 @@ int ff_find_unused_picture(MpegEncContext *s, int shared){ } av_log(s->avctx, AV_LOG_FATAL, "Internal error, picture buffer overflow\n"); @@ -52,7 +52,7 @@ index 4978d28..bb9509f 100644 + * the oldest we have & reusing its slot. */ + int oldest=0; + for(i=0; i<MAX_PICTURE_COUNT; i++){ -+ if (s->picture[i].coded_picture_number < s->picture[oldest].coded_picture_number) ++ if (s->picture[i].f.coded_picture_number < s->picture[oldest].f.coded_picture_number) + oldest = i; + } + s->avctx->release_buffer(s->avctx, (AVFrame*)&s->picture[oldest]); |