Michael Niedermayer
authored
* commit '2fcef90b': dxva2_h264: set the correct ref frame index in the long slice struct Conflicts: libavcodec/dxva2_h264.c See: 276839b8 Merged-by:Michael Niedermayer <michaelni@gmx.at>
* commit '2fcef90b': dxva2_h264: set the correct ref frame index in the long slice struct Conflicts: libavcodec/dxva2_h264.c See: 276839b8 Merged-by:Michael Niedermayer <michaelni@gmx.at>