Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 22:37:51 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 22:38:50 +0000 (00:38 +0200)
commit2548f8a237b1ef85d1b56a897e93d5af206e4654
treed20a19ca21aaaf4610c27d288562beb8d1da934c
parentfed0acebade8d27c428da5cad483cd6a5b64b354
parent2fcef90bee98bffeff1d95b7197738f50c450d86
Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'

* commit '2fcef90bee98bffeff1d95b7197738f50c450d86':
  dxva2_h264: set the correct ref frame index in the long slice struct

Conflicts:
libavcodec/dxva2_h264.c

See: 276839b8de7ff836a529bbd6221f615a343b23e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>