diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 14:55:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-17 14:56:01 +0200 |
| commit | a7320c1574d216d8f56af400ef3c6b523a366483 (patch) | |
| tree | 0c7d486c16dbab91806380510b2df8431228c5fe /libavcodec/imgconvert.h | |
| parent | 5b0c7052fb2cd0e0b736a6ac6ce382d7f5e0112a (diff) | |
| parent | ef2713747f9db4b59afa844e62493c09cefaf11e (diff) | |
| download | ffmpeg-a7320c1574d216d8f56af400ef3c6b523a366483.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation of libavcodec/x86/hevc_deblock.asm with nasm.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.h')
0 files changed, 0 insertions, 0 deletions