diff options
| author | Bradley Sepos <[email protected]> | 2016-10-26 14:56:39 -0400 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2016-12-17 07:28:51 -0800 |
| commit | 2490f8ecf56a6aa1dafbd59682b82b326aeb20e8 (patch) | |
| tree | ceee7e5749b0569163856e99de57d3f22a7f7bf3 /contrib/ffmpeg/A06-vc1-decode.patch | |
| parent | c4d539e1791b3fcc3788c4c7656abe55675267b0 (diff) | |
contrib: Update to Libav 12.
Diffstat (limited to 'contrib/ffmpeg/A06-vc1-decode.patch')
| -rw-r--r-- | contrib/ffmpeg/A06-vc1-decode.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/contrib/ffmpeg/A06-vc1-decode.patch b/contrib/ffmpeg/A06-vc1-decode.patch deleted file mode 100644 index e94993951..000000000 --- a/contrib/ffmpeg/A06-vc1-decode.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab -Author: Michael Niedermayer <[email protected]> -AuthorDate: Sun Sep 21 16:16:32 2014 +0100 -Commit: Tim Walker <[email protected]> -CommitDate: Fri Sep 26 16:55:36 2014 +0200 - - vc1: Use logical instead of bitwise or for twomv - - CC: [email protected] - Signed-off-by: Michael Niedermayer <[email protected]> - Signed-off-by: Tim Walker <[email protected]> - -diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c -index 35245ab..41beaeb 100644 ---- a/libavcodec/vc1dec.c -+++ b/libavcodec/vc1dec.c -@@ -4570,9 +4570,9 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) - if (mb_has_coeffs) - cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); - if (!direct) { -- if (bmvtype == (BMV_TYPE_INTERPOLATED & twomv)) { -+ if (bmvtype == BMV_TYPE_INTERPOLATED && twomv) { - v->fourmvbp = get_vlc2(gb, v->fourmvbp_vlc->table, VC1_4MV_BLOCK_PATTERN_VLC_BITS, 1); -- } else if (bmvtype == (BMV_TYPE_INTERPOLATED | twomv)) { -+ } else if (bmvtype == BMV_TYPE_INTERPOLATED || twomv) { - v->twomvbp = get_vlc2(gb, v->twomvbp_vlc->table, VC1_2MV_BLOCK_PATTERN_VLC_BITS, 1); - } - } |