FFmpeg

Mirror of https://git.ffmpeg.org/ffmpeg.git https://ffmpeg.org/

Michael Niedermayer 99eb31e263 Merge remote-tracking branch 'qatar/master' * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>		14 years ago
..
fate	H264/MPEG frame-level multi-threading.	14 years ago
ref	H264/MPEG frame-level multi-threading.	14 years ago
audiogen.c	Replace FFmpeg with Libav in licence headers	14 years ago
base64.c	Replace FFmpeg with Libav in licence headers	14 years ago
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	14 years ago
copy.regression.ref	Make sure we dont double test files and sort the list.	15 years ago
copycooker.sh	Remove now obsolete references to _g-suffixed binaries.	14 years ago
fate-run.sh	FATE: allow forcing thread-type when doing threaded fate runs.	14 years ago
fate-update.sh	fate: remove stale fate-update.sh script	14 years ago
fate.mak	Split fate-psx-str-v3 into a video-only and audio-only test.	14 years ago
fate.sh	fate: add comment field	14 years ago
fate2.mak	Increase STDDEV tolerance for the fate-amrwb-14k25 test so it pass in	14 years ago
ffserver-regression.sh	Make ffserver regression test run (still fails)	15 years ago
ffserver.conf	Rename test.conf --> ffserver.conf, the new name is more meaningful.	16 years ago
ffserver.regression.ref	update ffserver regression ref	16 years ago
lavf-regression.sh	fate: remove do_ffmpeg_nocheck function	14 years ago
lavfi-regression.sh	Merge remote-tracking branch 'qatar/master'	14 years ago
lena.pnm	finished integrating rotozoom test in ffmpeg	22 years ago
md5.sh	regtest: add openssl to md5 alternatives	14 years ago
regression-funcs.sh	H264/MPEG frame-level multi-threading.	14 years ago
rotozoom.c	Merge remote branch 'qatar/master'	14 years ago
seek_test.c	Replace FFmpeg with Libav in licence headers	14 years ago
tiny_psnr.c	tests: Remove disabled code.	14 years ago
videogen.c	Replace FFmpeg with Libav in licence headers	14 years ago