Merge remote-tracking branch 'qatar/master'

* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 13 insertions, 13 deletions

diff --git a/libavcodec/x86/h264_idct_10bit.asm b/libavcodec/x86/h264_idct_10bit.asm
index a9c12da5a2..f94207bb11 100644
--- a/libavcodec/x86/h264_idct_10bit.asm
+++ b/libavcodec/x86/h264_idct_10bit.asm
@@ -98,7 +98,7 @@ cglobal h264_idct_add_10_%1, 3,3
 
 INIT_XMM
 IDCT_ADD_10 sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 IDCT_ADD_10 avx
 %endif
@@ -128,7 +128,7 @@ add4x4_idct_%1:
 INIT_XMM
 ALIGN 16
 ADD4x4IDCT sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 ALIGN 16
 ADD4x4IDCT avx
@@ -168,7 +168,7 @@ cglobal h264_idct_add16_10_%1, 5,6
 
 INIT_XMM
 IDCT_ADD16_10 sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 IDCT_ADD16_10 avx
 %endif
@@ -234,7 +234,7 @@ cglobal h264_idct8_dc_add_10_%1,3,3,7
 
 INIT_XMM
 IDCT8_DC_ADD sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 IDCT8_DC_ADD avx
 %endif
@@ -305,7 +305,7 @@ cglobal h264_idct_add16intra_10_%1,5,7,8
 
 INIT_XMM
 IDCT_ADD16INTRA_10 sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 IDCT_ADD16INTRA_10 avx
 %endif
@@ -316,7 +316,7 @@ IDCT_ADD16INTRA_10 avx
 ;-----------------------------------------------------------------------------
 %macro IDCT_ADD8 1
 cglobal h264_idct_add8_10_%1,5,7
-%ifdef ARCH_X86_64
+%if ARCH_X86_64
     mov r10, r0
 %endif
     add      r2, 1024
@@ -324,7 +324,7 @@ cglobal h264_idct_add8_10_%1,5,7
     ADD16_OP_INTRA %1, 16, 4+ 6*8
     ADD16_OP_INTRA %1, 18, 4+ 7*8
     add      r2, 1024-128*2
-%ifdef ARCH_X86_64
+%if ARCH_X86_64
     mov      r0, [r10+gprsize]
 %else
     mov      r0, r0m
@@ -342,7 +342,7 @@ cglobal h264_idct_add8_10_%1,5,7
 
 INIT_XMM
 IDCT_ADD8 sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 IDCT_ADD8 avx
 %endif
@@ -411,7 +411,7 @@ IDCT_ADD8 avx
 ; %1=int16_t *block, %2=int16_t *dstblock
 %macro IDCT8_ADD_SSE_START 2
     IDCT8_1D_FULL %1
-%ifdef ARCH_X86_64
+%if ARCH_X86_64
     TRANSPOSE4x4D  0,1,2,3,8
     mova    [%2    ], m0
     TRANSPOSE4x4D  4,5,6,7,8
@@ -452,7 +452,7 @@ IDCT_ADD8 avx
 
 %macro IDCT8_ADD 1
 cglobal h264_idct8_add_10_%1, 3,4,16
-%ifndef UNIX64
+%if UNIX64 == 0
     %assign pad 16-gprsize-(stack_offset&15)
     sub  rsp, pad
     call h264_idct8_add1_10_%1
@@ -467,7 +467,7 @@ h264_idct8_add1_10_%1:
     sub          rsp, pad
     add   dword [r1], 32
 
-%ifdef ARCH_X86_64
+%if ARCH_X86_64
     IDCT8_ADD_SSE_START r1, rsp
     SWAP 1,  9
     SWAP 2, 10
@@ -519,7 +519,7 @@ h264_idct8_add1_10_%1:
 
 INIT_XMM
 IDCT8_ADD sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 IDCT8_ADD avx
 %endif
@@ -559,7 +559,7 @@ cglobal h264_idct8_add4_10_%1, 0,7,16
 
 INIT_XMM
 IDCT8_ADD4 sse2
-%ifdef HAVE_AVX
+%if HAVE_AVX
 INIT_AVX
 IDCT8_ADD4 avx
 %endif