diff options
| author | Martin Storsjö <[email protected]> | 2020-04-24 15:04:18 +0300 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2020-04-27 13:43:46 -0600 |
| commit | 07b8eb2da1db1fae5cd274447d88e08ef31df750 (patch) | |
| tree | c188e388b0bbe10abd9060cc68031c8e7e8bcce7 | |
| parent | a597cd83034623afe457a970ee99c3a7e5678153 (diff) | |
contrib: ffmpeg: Remove a patch that has been merged upstream
This patch (with a minor modification) has been merged upstream
in http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=08b1d1d8122517d07f2335437cde0aeedc50143f,
which was part of the 4.1 release - and we currently build
4.2.2.
(cherry picked from commit ab3ee6e7df7ce2da4effacf1b1420edadaf04ba9)
| -rw-r--r-- | contrib/ffmpeg/A02-corrupt-h264-frames.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/contrib/ffmpeg/A02-corrupt-h264-frames.patch b/contrib/ffmpeg/A02-corrupt-h264-frames.patch deleted file mode 100644 index cf26e2063..000000000 --- a/contrib/ffmpeg/A02-corrupt-h264-frames.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c -index d71ddbe9ba..215a6d3c65 100644 ---- a/libavcodec/h264_slice.c -+++ b/libavcodec/h264_slice.c -@@ -1407,6 +1407,12 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, - - sps = h->ps.sps; - -+ if (sps && sps->bitstream_restriction_flag && -+ h->avctx->has_b_frames < sps->num_reorder_frames) { -+ h->avctx->has_b_frames = FFMAX(h->avctx->has_b_frames, -+ sps->num_reorder_frames); -+ } -+ - last_pic_droppable = h->droppable; - last_pic_structure = h->picture_structure; - h->droppable = (nal->ref_idc == 0); |