diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-26 23:58:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-26 23:58:51 +0200 |
| commit | 1221b7df6817e4d2603e7ca8c226ce0e13eee5bb (patch) | |
| tree | f714c24ebddb051d968997cca0c4e0d1160628ba /libavformat/asf.c | |
| parent | a4d76faf45cf1ec7d39d62b4707260e211a932c7 (diff) | |
| parent | 92fdc80cab2acad9f171ba38a08aa89b392bdadd (diff) | |
| download | ffmpeg-1221b7df6817e4d2603e7ca8c226ce0e13eee5bb.tar.gz | |
Merge commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd'
* commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd':
nvenc: Fix NV12 input
Conflicts:
libavcodec/nvenc.c
Not merged, the changed code is not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asf.c')
0 files changed, 0 insertions, 0 deletions