mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-21 05:46:55 +00:00
Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'
* commit 'd456baafb68cd80c0f537f1d843076e4dd853558':
vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()
Conflicts:
libavcodec/vc1dec.c
See: 1e2ab98460
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
580e81fca5