29d147c94d
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc> |
||
---|---|---|
.. | ||
examples | ||
APIchanges | ||
authors.texi | ||
bitstream_filters.texi | ||
bootstrap.min.css | ||
build_system.txt | ||
codecs.texi | ||
decoders.texi | ||
default.css | ||
demuxers.texi | ||
developer.texi | ||
devices.texi | ||
doxy-wrapper.sh | ||
Doxyfile | ||
encoders.texi | ||
errno.txt | ||
faq.texi | ||
fate_config.sh.template | ||
fate.texi | ||
ffmpeg-bitstream-filters.texi | ||
ffmpeg-codecs.texi | ||
ffmpeg-devices.texi | ||
ffmpeg-filters.texi | ||
ffmpeg-formats.texi | ||
ffmpeg-protocols.texi | ||
ffmpeg-resampler.texi | ||
ffmpeg-scaler.texi | ||
ffmpeg-utils.texi | ||
ffmpeg.texi | ||
ffmpeg.txt | ||
ffplay.texi | ||
ffprobe.texi | ||
ffprobe.xsd | ||
ffserver.conf | ||
ffserver.texi | ||
fftools-common-opts.texi | ||
filter_design.txt | ||
filters.texi | ||
formats.texi | ||
general.texi | ||
git-howto.texi | ||
indevs.texi | ||
issue_tracker.txt | ||
libavcodec.texi | ||
libavdevice.texi | ||
libavfilter.texi | ||
libavformat.texi | ||
libavutil.texi | ||
libswresample.texi | ||
libswscale.texi | ||
Makefile | ||
metadata.texi | ||
mips.txt | ||
multithreading.txt | ||
muxers.texi | ||
nut.texi | ||
optimization.txt | ||
outdevs.texi | ||
platform.texi | ||
print_options.c | ||
protocols.texi | ||
rate_distortion.txt | ||
resampler.texi | ||
scaler.texi | ||
snow.txt | ||
style.min.css | ||
swresample.txt | ||
swscale.txt | ||
t2h.init | ||
t2h.pm | ||
tablegen.txt | ||
texi2pod.pl | ||
texidep.pl | ||
utils.texi | ||
writing_filters.txt |