diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 11:52:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 11:53:51 +0100 |
| commit | c0f02b220182cc7997bd6b5279881b898f52dfbf (patch) | |
| tree | 67c21ef1c8441d60dcc7054cae839b451d448a75 /libavcodec/mpeg_er.h | |
| parent | 96b495f443832082777d7dad7349dd6ec97b6cb9 (diff) | |
| parent | 36a6fb989b017898041703025ef20028146675a8 (diff) | |
| download | ffmpeg-c0f02b220182cc7997bd6b5279881b898f52dfbf.tar.gz | |
Merge commit '36a6fb989b017898041703025ef20028146675a8'
* commit '36a6fb989b017898041703025ef20028146675a8':
hevc_deblock: Fix compilation with nasm
See: c75fdee747179e21e3cc137b2565ba911b17f9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg_er.h')
0 files changed, 0 insertions, 0 deletions