lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions
android_external_ffmpeg/tests
History
Michael Niedermayer 022f8d27dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
	configure
	libavcodec/arm/dca.h
	libavcodec/dca.c
	libavcodec/mlp_parser.c
	libavcodec/version.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavutil/audioconvert.c
	libavutil/avutil.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 01:12:08 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
ref ffmpeg: rewrite vsync / notimestamps handling 2011-11-24 04:57:38 +01:00
audiogen.c
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
fate-update.sh
fate.mak Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
fate.sh fate.sh: Ignore errors from rm command during cleanup. 2011-09-22 17:39:30 +02:00
fate2.mak fate: fix mapchan 2011-11-06 03:01:01 +01:00
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
ffserver-regression.sh Remove the ffserver test. 2011-08-01 11:36:16 +02:00
ffserver.conf Remove the ffserver test. 2011-08-01 11:36:16 +02:00
ffserver.regression.ref Remove the ffserver test. 2011-08-01 11:36:16 +02:00
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2011-11-19 02:00:06 +01:00
lavfi-regression.sh Merge commit 'b2c087871d' 2011-08-13 02:56:08 +02:00
lena.pnm
Makefile fate: add --timeout=60 --contimeout=60 to fate-rsync 2011-11-07 15:13:16 +01:00
md5.sh
regression-funcs.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
rotozoom.c Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
tiny_psnr.c
videogen.c