• Michael Niedermayer's avatar
    Merge commit '059a9348' · 29d147c9
    Michael Niedermayer authored
    * commit '059a9348':
      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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
    29d147c9
Name
Last commit
Last update
..
examples Loading commit data...
APIchanges Loading commit data...
Doxyfile Loading commit data...
Makefile Loading commit data...
authors.texi Loading commit data...
bitstream_filters.texi Loading commit data...
bootstrap.min.css Loading commit data...
build_system.txt Loading commit data...
codecs.texi Loading commit data...
decoders.texi Loading commit data...
default.css Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
devices.texi Loading commit data...
doxy-wrapper.sh Loading commit data...
encoders.texi Loading commit data...
errno.txt Loading commit data...
faq.texi Loading commit data...
fate.texi Loading commit data...
fate_config.sh.template Loading commit data...
ffmpeg-bitstream-filters.texi Loading commit data...
ffmpeg-codecs.texi Loading commit data...
ffmpeg-devices.texi Loading commit data...
ffmpeg-filters.texi Loading commit data...
ffmpeg-formats.texi Loading commit data...
ffmpeg-protocols.texi Loading commit data...
ffmpeg-resampler.texi Loading commit data...
ffmpeg-scaler.texi Loading commit data...
ffmpeg-utils.texi Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffprobe.xsd Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
fftools-common-opts.texi Loading commit data...
filter_design.txt Loading commit data...
filters.texi Loading commit data...
formats.texi Loading commit data...
general.texi Loading commit data...
git-howto.texi Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavcodec.texi Loading commit data...
libavdevice.texi Loading commit data...
libavfilter.texi Loading commit data...
libavformat.texi Loading commit data...
libavutil.texi Loading commit data...
libswresample.texi Loading commit data...
libswscale.texi Loading commit data...
metadata.texi Loading commit data...
mips.txt Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
nut.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
platform.texi Loading commit data...
print_options.c Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
resampler.texi Loading commit data...
scaler.texi Loading commit data...
snow.txt Loading commit data...
style.min.css Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
t2h.pm Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
texidep.pl Loading commit data...
utils.texi Loading commit data...
writing_filters.txt Loading commit data...