1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/tools
Michael Niedermayer 7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 22:45:46 +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: K&R reformatting cosmetics 2012-01-25 15:31:11 +01: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
graph2dot.c Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
ismindex.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
patcheck Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
probetest.c probetest: allow specifying parameters on the command line 2012-05-31 15:53:58 +02:00
qt-faststart.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
trasher.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
unwrap-diff Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00