Merge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 23:02:58 +0000 (01:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 23:04:44 +0000 (01:04 +0200)
commit9c6eef6f5fcfaa67c0d9b01e44434e4c26538f96
tree85b064956994f96d05c098d1eb253dc2b7ebeb2e
parent0f630b7b1244e7fab3dc66c3fb396186f7c09065
parentb2b4afe8115fe3c8b005d663610e5af06f110165
Merge commit 'b2b4afe8115fe3c8b005d663610e5af06f110165'

* commit 'b2b4afe8115fe3c8b005d663610e5af06f110165':
  hwaccel: fix dxva2 & vaapi loop filter parameters

See: 0ad8f73f137dad1f3d0f818e22bdb2949186e9ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>