virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
c4bdb2bf93
FFmpeg/tests
History
Michael Niedermayer a369a6b858 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  fate: add golomb-test
  golomb-test: K&R formatting cosmetics
  h264: Split h264-test off into a separate file - golomb-test.c.
  h264-test: cleanup: drop timer invocations, commented out code and other cruft
  h264-test: Remove unused DSP and AVCodec contexts and related init calls.
  adpcm: Add missing stdint.h #include to fix standalone header compilation.
  lavf: add functions for accessing the fourcc<->CodecID mapping tables.
  lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
  lavc: make avcodec_close() work properly on unopened codecs.
  lavc: add avcodec_is_open().
  lavf: rename AVInputFormat.value to raw_codec_id.
  lavf: remove the pointless value field from flv and iv8
  lavc/lavf: remove unnecessary symbols from the symbol version script.
  lavc: reorder AVCodec fields.
  lavf: reorder AVInput/OutputFormat fields.
  mp3dec: Fix a heap-buffer-overflow
  adpcmenc: remove some unneeded casts
  adpcmenc: use int16_t and uint8_t instead of short and unsigned char.
  adpcmenc: fix adpcm_ms extradata allocation
  adpcmenc: return proper AVERROR codes instead of -1
  ...

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/adpcmenc.c
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/libavcodec.v
	libavcodec/mpc7.c
	libavcodec/mpegaudiodec.c
	libavcodec/options.c
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/flvdec.c
	libavformat/libavformat.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-01 02:36:09 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
ref Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
asynth1.sw movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
base64.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
codec-regression.sh r210enc: don't write uninitialized data 2012-01-29 21:00:19 +01:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
fate-run.sh fate: give stderr hint when a test fails. 2011-12-26 22:27:01 +01:00
fate-update.sh
fate-valgrind.supp Add a --valgrind configure option. 2012-01-21 12:04:46 +01:00
fate.sh fate: add support for specifying the shell used to run configure 2012-01-30 20:35:09 +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' 2012-01-28 07:53:34 +01:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-31 02:46:26 +01:00
md5.sh
regression-funcs.sh Run zmbv regression without md5sum. 2011-12-10 19:34:28 +01:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
tiny_psnr.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
videogen.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00