diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:04:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 23:04:55 +0200 |
| commit | 2fc7c818cb7b7bfdca69d17ab9f1b48290dbc3f6 (patch) | |
| tree | 23a8f9c41f97be5cf9cdfd406575fa9ac9461b75 /libavformat/wtvenc.c | |
| parent | 2da5a5ce00caebbe3afbda8612588966cfeac477 (diff) | |
| parent | edd82267958fbbd34eca4f4dbfb96197b9b40ab5 (diff) | |
| download | ffmpeg-2fc7c818cb7b7bfdca69d17ab9f1b48290dbc3f6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fix build with nasm 2.08
x86: use nop cpu directives only if supported
x86: fix rNmp macros with nasm
build: add trailing / to yasm/nasm -I flags
x86: use 32-bit source registers with movd instruction
x86: add colons after labels
Conflicts:
Makefile
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtvenc.c')
0 files changed, 0 insertions, 0 deletions