diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-29 01:06:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-29 01:22:22 +0200 |
| commit | c6eee3120a594cf25feb892f952a409a512d182e (patch) | |
| tree | dfadf4547a680823f6805011d1bcf6077a9ce121 /libavutil/avstring.c | |
| parent | 9c6eef6f5fcfaa67c0d9b01e44434e4c26538f96 (diff) | |
| parent | 35177ba77ff60a8b8839783f57e44bcc4214507a (diff) | |
Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
avconv: add support for DXVA2 decoding
Conflicts:
Makefile
configure
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/avstring.c')
0 files changed, 0 insertions, 0 deletions