diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 11:01:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-09 11:01:14 +0200 |
| commit | 3469c24a1084f677b407bb9fd4099d7a6b6bbc6c (patch) | |
| tree | 47ceaab1f59ddadb8574a3c29499aa0c1f48d602 /libavcodec/jpeglsenc.c | |
| parent | e4723a82f7088f5d4ab32ada529c3f69ba3606b0 (diff) | |
| parent | 87614667606b42476f9017d79faf12b45a0bd77c (diff) | |
| download | ffmpeg-3469c24a1084f677b407bb9fd4099d7a6b6bbc6c.tar.gz | |
Merge commit '87614667606b42476f9017d79faf12b45a0bd77c'
* commit '87614667606b42476f9017d79faf12b45a0bd77c':
x86: dsputil: Move ff_pd assembly constants to the only place they are used
Conflicts:
libavcodec/x86/lpc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsenc.c')
0 files changed, 0 insertions, 0 deletions