Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Jun 2012 19:45:52 +0000 (21:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Jun 2012 19:45:52 +0000 (21:45 +0200)
* qatar/master:
  mpegts: Remove disabled extension matching probe.
  fate: avoid freopen(NULL) in videogen/rotozoom

Conflicts:
tests/rotozoom.c
tests/videogen.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mpegts.c
tests/Makefile
tests/rotozoom.c
tests/videogen.c

Simple merge
diff --cc tests/Makefile
@@@ -28,12 -16,12 +28,12 @@@ tests/data/asynth-%.wav: tests/audiogen
        $(M)./$< $@ $(subst -, ,$*)
  
  tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data
-       $(M)$< >$@
+       $(M)$< $@
  
  tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
-       $(M)$< $(SRC_PATH)/tests/lena.pnm >$@
+       $(M)$< $(SRC_PATH)/tests/lena.pnm $@
  
 -tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
 +tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
  
  include $(SRC_PATH)/tests/fate/acodec.mak
  include $(SRC_PATH)/tests/fate/vcodec.mak
Simple merge
Simple merge