Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'

* commit 'a7d2861d36756b913e85681b86ed3385274e8ced':
  svq3: K&R formatting cosmetics
  fate: Introduce ENCMUX macro for tests that require encoders and a muxer
  ffv1: Add missing #includes to header file

Conflicts:
	libavcodec/ffv1.h
	libavcodec/svq3.c

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

libavcodec/ffv1.h

@@ -35,11 +35,12 @@
 #include "libavutil/pixdesc.h"
 #include "libavutil/timer.h"
 #include "avcodec.h"
-#include "internal.h"
 #include "dsputil.h"
-#include "rangecoder.h"
-#include "golomb.h"
+#include "get_bits.h"
+#include "internal.h"
 #include "mathops.h"
+#include "put_bits.h"
+#include "rangecoder.h"
 
 #ifdef __INTEL_COMPILER
 #undef av_flatten

tests/Makefile

@@ -55,6 +55,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER  \
                          $(firstword $(3))_MUXER   $(lastword $(3))_DEMUXER)
 
 DEMDEC  = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
+ENCMUX  = $(call ALLYES, $(2:%=%_ENCODER) $(1)_MUXER)
 
 include $(SRC_PATH)/tests/fate/acodec.mak
 include $(SRC_PATH)/tests/fate/vcodec.mak

tests/fate/avformat.mak

@@ -29,7 +29,7 @@ FATE_LAVF-$(call ENCDEC,  PGM,                   IMAGE2PIPE)         += pgmpipe
 FATE_LAVF-$(call ENCDEC,  PNG,                   IMAGE2)             += png
 FATE_LAVF-$(call ENCDEC,  PPM,                   IMAGE2)             += ppm
 FATE_LAVF-$(call ENCDEC,  PPM,                   IMAGE2PIPE)         += ppmpipe
-FATE_LAVF-$(call ALLYES,  RV10_ENCODER AC3_FIXED_ENCODER RM_MUXER)   += rm
+FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
 FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
 FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox

tests/fate/seek.mak

@@ -100,7 +100,7 @@ FATE_SEEK-$(call ENCDEC,  PGM,                   IMAGE2)      += image_pgm
 FATE_SEEK-$(call ENCDEC,  PGM,                   IMAGE2PIPE)  += pgmpipe_pgm
 FATE_SEEK-$(call ENCDEC,  PPM,                   IMAGE2)      += image_ppm
 FATE_SEEK-$(call ENCDEC,  PPM,                   IMAGE2PIPE)  += ppmpipe_ppm
-FATE_SEEK-$(call ALLYES,  RV10_ENCODER AC3_FIXED_ENCODER RM_MUXER) += lavf_rm
+FATE_SEEK-$(call ENCMUX,  RV10 AC3_FIXED,        RM)          += lavf_rm
 FATE_SEEK-$(call ENCDEC,  SGI,                   IMAGE2)      += image_sgi
 FATE_SEEK-$(call ENCDEC,  FLV,                   SWF)         += lavf_swf
 FATE_SEEK-$(call ENCDEC,  TARGA,                 IMAGE2)      += image_tga