diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 01:35:53 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-16 01:35:53 +0400 |
commit | 1a34478b7183b1a08caab7eac56b452609725736 (patch) | |
tree | 4ddae5c3407716d83b592694cdabbdb3dff3041f /libavcodec/x86/h264_weight.asm | |
parent | 6ae356c9a0987d56f60137f9784afcb3a9303037 (diff) | |
parent | cc73511e8e81b2e1454f406acb71da9fd1c60d32 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix NASM include directive
dsputil_mmx: Honor HAVE_AMD3DNOW
lavf,lavd: remove all usage of AVFormatParameters from demuxers.
jack: add 'channels' private option.
VC-1: fix reading of custom PAR.
Remove redundant and dubious video codec detection by its extradata
mpeg12: remove repeat-field code disabled since May 2002
patch checklist: suggest fate instead of regression tests
Turn on resampling on sudden size change instead of bailing out during recode.
avtools: reinitialise filter chain when input video stream changes dimensions
Conflicts:
Makefile
avconv.c
doc/developer.texi
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavdevice/libdc1394.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_weight.asm')
-rw-r--r-- | libavcodec/x86/h264_weight.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm index bb0af86097..87544ae288 100644 --- a/libavcodec/x86/h264_weight.asm +++ b/libavcodec/x86/h264_weight.asm @@ -21,7 +21,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%include "libavutil/x86/x86inc.asm" +%include "x86inc.asm" SECTION .text |