generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
dd1e6b2a13
ffmpeg/tools
History
Michael Niedermayer 31ab1575e5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: Convert some commented-out printf/av_log instances to av_dlog
  avcodec: Drop silly and/or broken printf debug output
  avcodec: Drop some silly commented-out av_log() invocations
  avformat: Convert some commented-out printf/av_log instances to av_dlog
  avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
  Remove some silly disabled code.
  ac3dec: ensure get_buffer() gets a buffer for the correct number of channels

Conflicts:
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h264.c
	libavcodec/h264_parser.c
	libavcodec/mjpegdec.c
	libavcodec/motion_est_template.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/put_bits.h
	libavcodec/ratecontrol.c
	libavcodec/wmaenc.c
	libavdevice/timefilter.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/avienc.c
	libavformat/flvenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-01 16:12:38 +02:00
..
aviocat.c Replace usleep() calls with av_usleep() 2012-06-22 17:15:36 +01:00
bisect-create tools/bisect-create: Support "bisect run" 2012-07-24 01:24:23 +02:00
build_libstagefright Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
clean-diff Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00
cws2fws.c tools: Include io.h for open/read/write/close if unistd.h doesn't exist 2012-08-29 00:24:07 +03:00
enum_options.c tools: add a tool for enumerating/printing AVOptions in texinfo format 2011-10-24 14:18:07 +02:00
ffeval.c tools: add ffeval tool 2012-01-17 12:10:07 +01:00
fourcc2pixfmt.c tools: move raw-test program to tools, with the name fourcc2pixfmt 2012-09-14 23:04:38 +02:00
graph2dot.c tools/graphdot: unbreak syntax 2012-09-14 11:29:25 +02:00
ismindex.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
make_chlayout_test tools: add make_chlayout_test perl script. 2012-08-28 15:18:27 +02:00
missing_codec_desc tools: add a script to find missing codec descriptors. 2012-08-13 10:44:59 +02:00
patcheck Fix two "skiping" typo. 2012-09-25 07:42:32 +02:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
probetest.c probetest: allow specifying parameters on the command line 2012-05-31 15:53:58 +02:00
qt-faststart.c qt-faststart: simplify code by using FFMIN 2012-09-30 22:19:54 +02:00
trasher.c Merge remote-tracking branch 'qatar/master' 2012-09-14 14:13:38 +02:00
unwrap-diff Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00
yuvcmp.c Remove mt-work directory 2012-09-15 15:40:36 -04:00