diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:11:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:11:27 +0100 |
| commit | 8fbc6e59118d2cc10a712ea8de0e10d2d984bcee (patch) | |
| tree | 1ea018de258d81f5842ac0abd981c32c05c5a8fc /libavcodec/mpeg4data.h | |
| parent | 32da2fd422651f1f36f26975685cb7f7ff5a678b (diff) | |
| parent | 1a8d0cf77ed2611e542ae98f341d4c43a04467bd (diff) | |
| download | ffmpeg-8fbc6e59118d2cc10a712ea8de0e10d2d984bcee.tar.gz | |
Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
x86: dsputil: Move inline assembly macros to a separate header
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4data.h')
0 files changed, 0 insertions, 0 deletions