diff options
| author | Clément Bœsch <[email protected]> | 2016-07-09 14:49:32 +0200 |
|---|---|---|
| committer | Clément Bœsch <[email protected]> | 2016-07-09 14:49:32 +0200 |
| commit | 1ad3ffadd9102b4a752c634e401a1438eba9d416 (patch) | |
| tree | ea4b7bed58e0253f2054decc9577f5b5b0f1d99b /libavcodec/vaapi_encode.c | |
| parent | 3536493082be8a4837a2a6aaeecb07ad190beefb (diff) | |
| parent | a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42 (diff) | |
Merge commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42'
* commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42':
avdevice: Ignore timefilter test program
This commit is a noop, /timefilter entry was added in the original merge
(5d48e4eafa6c4559683892b8638d10508125f3cf)
Merged-by: Clément Bœsch <[email protected]>
Diffstat (limited to 'libavcodec/vaapi_encode.c')
0 files changed, 0 insertions, 0 deletions