diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 23:44:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 23:44:31 +0100 |
| commit | ce612fc1863830f1b5255beb42e244138f78e145 (patch) | |
| tree | 75b4f076c8e3df5f61884ee64674a45b1dbf2f80 /libavcodec/vaapi_mpeg4.c | |
| parent | 4fa91b88c6180957781036614fa94a6fc3b7046f (diff) | |
| parent | dfc50ac85e9d68a771b556297b7c411650206f3b (diff) | |
| download | ffmpeg-ce612fc1863830f1b5255beb42e244138f78e145.tar.gz | |
Merge commit 'dfc50ac85e9d68a771b556297b7c411650206f3b'
* commit 'dfc50ac85e9d68a771b556297b7c411650206f3b':
x86: mpegvideo: move denoise_dct asm to mpegvideoenc
Conflicts:
libavcodec/x86/mpegvideo.c
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_mpeg4.c')
0 files changed, 0 insertions, 0 deletions