RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/doc
History
Michael Niedermayer ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-10-08 21:06:57 +02:00
..
doxy
…
examples Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
APIchanges Merge commit '78071a1420b425dfb787ac739048f523007b8139' 2012-10-08 19:42:49 +02:00
Makefile
…
RELEASE_NOTES doc/RELEASE_NOTES: update for the 9 release. 2012-10-06 13:55:18 +02:00
avtools-common-opts.texi
…
avutil.txt
…
bitstream_filters.texi
…
build_system.txt
…
decoders.texi
…
demuxers.texi
…
developer.texi
…
encoders.texi
…
errno.txt
…
eval.texi
…
faq.texi doc/faq: Change the Visual Studio entry to reflect current status 2012-09-28 16:34:18 -04:00
fate.texi doc/fate: Move fate config example into doc subdirectory 2012-09-29 19:27:01 +02:00
fate_config.sh.template doc/fate: Move fate config example into doc subdirectory 2012-09-29 19:27:01 +02:00
ffmpeg.texi Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
ffmpeg.txt
…
ffplay.texi
…
ffprobe.texi ffprobe: add -select_streams option 2012-10-05 23:58:18 +02:00
ffprobe.xsd ffprobe: extend disposition printing support 2012-09-30 12:22:19 +02:00
ffserver.conf
…
ffserver.texi
…
filter_design.txt doc: fix typos in filter documentation 2012-09-18 09:06:44 +02:00
filters.texi Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
general.texi TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
git-howto.texi
…
git-howto.txt
…
indevs.texi lavd/dshow: support video codec and pixel format selection 2012-09-07 09:59:12 +02:00
issue_tracker.txt
…
metadata.texi
…
mips.txt Optimization of AC3 floating point decoder for MIPS 2012-09-05 20:09:56 +02:00
multithreading.txt
…
muxers.texi lavf/segment: add segment_list_flags option 2012-09-11 01:24:54 +02:00
optimization.txt
…
outdevs.texi
…
platform.texi doc/platform: Rework the Visual Studio linking section 2012-09-28 16:35:49 -04:00
print_options.c
…
protocols.texi Document tcp proto 'timeout' parameter behavior 2012-09-15 16:26:00 +02:00
rate_distortion.txt
…
snow.txt
…
soc.txt
…
swresample.txt doc/swresample.txt: fix typos 2012-10-02 09:43:27 +02:00
swscale.txt
…
syntax.texi
…
t2h.init doc: declare encoding for texi2html. 2012-07-22 12:48:57 +02:00
tablegen.txt
…
texi2pod.pl
…
viterbi.txt
…