diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:41:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:41:35 +0100 |
| commit | 30156eab6d816878bb404fb1565d026aad0d2d9e (patch) | |
| tree | c8c44afc883f465a80b37020276edb0a95b99c33 /libavformat/mm.c | |
| parent | c192be196839ae28a55b37a01209bc052b8fdbe3 (diff) | |
| parent | de1f8ead8993512925a3ee6c7491473414419e55 (diff) | |
| download | ffmpeg-30156eab6d816878bb404fb1565d026aad0d2d9e.tar.gz | |
Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'
* commit 'de1f8ead8993512925a3ee6c7491473414419e55':
hevcdsp_template: templatize transquant_bypass
Conflicts:
libavcodec/hevcdsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mm.c')
0 files changed, 0 insertions, 0 deletions