[FFmpeg-cvslog] Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
Clément Bœsch
git at videolan.org
Tue Jun 21 21:56:20 CEST 2016
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Jun 21 21:55:20 2016 +0200| [8ef57a0d6154119e1a616dd8c29e8c32e35808a0] | committer: Clément Bœsch
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u at pkh.me>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ef57a0d6154119e1a616dd8c29e8c32e35808a0
---
Changelog | 6 +-
doc/APIchanges | 2 +-
doc/examples/decoding_encoding.c | 20 +++---
doc/examples/muxing.c | 2 +-
doc/ffmpeg.texi | 2 +-
doc/filters.texi | 6 +-
doc/git-howto.texi | 4 +-
doc/nut.texi | 2 +-
doc/optimization.txt | 4 +-
doc/platform.texi | 4 +-
doc/swscale.txt | 4 +-
ffmpeg.c | 2 +-
ffplay.c | 2 +-
libavcodec/aarch64/mpegaudiodsp_neon.S | 2 +-
libavcodec/aasc.c | 2 +-
libavcodec/adpcm.c | 2 +-
libavcodec/adpcm.h | 2 +-
libavcodec/adpcm_data.c | 2 +-
libavcodec/adpcm_data.h | 2 +-
libavcodec/adpcmenc.c | 2 +-
libavcodec/alac.c | 28 ++++----
libavcodec/amrnbdec.c | 4 +-
libavcodec/amrwbdata.h | 2 +-
libavcodec/ansi.c | 2 +-
libavcodec/apedec.c | 4 +-
libavcodec/arm/mlpdsp_armv6.S | 2 +-
libavcodec/arm/mpegvideo_armv5te.c | 2 +-
libavcodec/arm/simple_idct_arm.S | 6 +-
libavcodec/arm/vp8dsp_neon.S | 2 +-
libavcodec/avcodec.h | 42 ++++++------
libavcodec/bink.c | 2 +-
libavcodec/bitstream.c | 4 +-
libavcodec/bsf.h | 2 +-
libavcodec/cinepak.c | 2 +-
libavcodec/cook.c | 6 +-
libavcodec/cookdata.h | 2 +-
libavcodec/cyuv.c | 2 +-
libavcodec/dcadata.c | 6 +-
libavcodec/dct-test.c | 2 +-
libavcodec/dnxhdenc.c | 3 +-
libavcodec/dpcm.c | 2 +-
libavcodec/dxva2_h264.c | 2 +-
libavcodec/eamad.c | 4 +-
libavcodec/elbg.c | 4 +-
libavcodec/error_resilience.c | 2 +-
libavcodec/error_resilience.h | 2 +-
libavcodec/exr.c | 10 +--
libavcodec/faxcompr.h | 2 +-
libavcodec/flicvideo.c | 6 +-
libavcodec/flvenc.c | 2 +-
libavcodec/g723_1dec.c | 4 +-
libavcodec/g726.c | 26 +++----
libavcodec/get_bits.h | 4 +-
libavcodec/h261.c | 4 +-
libavcodec/h261.h | 4 +-
libavcodec/h261_parser.c | 4 +-
libavcodec/h261dec.c | 4 +-
libavcodec/h261enc.c | 2 +-
libavcodec/h263.c | 8 +--
libavcodec/h263.h | 4 +-
libavcodec/h263data.c | 2 +-
libavcodec/h263data.h | 2 +-
libavcodec/h263dec.c | 8 +--
libavcodec/h264.c | 2 +-
libavcodec/h264.h | 8 +--
libavcodec/h2645_parse.h | 2 +-
libavcodec/h264_cabac.c | 4 +-
libavcodec/h264_cavlc.c | 2 +-
libavcodec/h264_direct.c | 2 +-
libavcodec/h264_loopfilter.c | 2 +-
libavcodec/h264_mb.c | 4 +-
libavcodec/h264_mvpred.h | 4 +-
libavcodec/h264_parse.h | 2 +-
libavcodec/h264_parser.c | 2 +-
libavcodec/h264_picture.c | 2 +-
libavcodec/h264_ps.c | 2 +-
libavcodec/h264_refs.c | 4 +-
libavcodec/h264_sei.c | 4 +-
libavcodec/h264_slice.c | 6 +-
libavcodec/h264addpx_template.c | 2 +-
libavcodec/h264data.c | 4 +-
libavcodec/h264dsp.c | 2 +-
libavcodec/h264dsp.h | 2 +-
libavcodec/h264dsp_template.c | 2 +-
libavcodec/h264pred.c | 4 +-
libavcodec/h264pred.h | 4 +-
libavcodec/h264pred_template.c | 2 +-
libavcodec/hevc_mvs.c | 2 +-
libavcodec/hevc_sei.c | 2 +-
libavcodec/idcinvideo.c | 2 +-
libavcodec/imc.c | 2 +-
libavcodec/indeo3.c | 4 +-
libavcodec/indeo3data.h | 4 +-
libavcodec/intelh263dec.c | 8 +--
libavcodec/interplayvideo.c | 2 +-
libavcodec/intrax8.c | 10 +--
libavcodec/ituh263dec.c | 18 ++---
libavcodec/ituh263enc.c | 18 ++---
libavcodec/ivi_dsp.c | 2 +-
libavcodec/ivi_dsp.h | 2 +-
libavcodec/jpeg2000.c | 2 +-
libavcodec/jpeglsenc.c | 2 +-
libavcodec/lagarith.c | 10 +--
libavcodec/libopencore-amr.c | 4 +-
libavcodec/libopusdec.c | 2 +-
libavcodec/libschroedingerenc.c | 2 +-
libavcodec/libspeexenc.c | 2 +-
libavcodec/libtheoraenc.c | 2 +-
libavcodec/libvo-amrwbenc.c | 4 +-
libavcodec/libxvid.c | 8 +--
libavcodec/lsp.c | 2 +-
libavcodec/lsp.h | 2 +-
libavcodec/mjpegdec.c | 2 +-
libavcodec/mjpegenc.h | 2 +-
libavcodec/mlp_parser.h | 6 +-
libavcodec/motion_est.c | 8 +--
libavcodec/motion_est_template.c | 8 +--
libavcodec/motionpixels_tablegen.c | 2 +-
libavcodec/motionpixels_tablegen.h | 2 +-
libavcodec/mpeg12.h | 2 +-
libavcodec/mpeg12data.c | 4 +-
libavcodec/mpeg12data.h | 4 +-
libavcodec/mpeg12dec.c | 10 +--
libavcodec/mpeg12enc.c | 12 ++--
libavcodec/mpeg12vlc.h | 4 +-
libavcodec/mpeg4data.h | 6 +-
libavcodec/mpeg4video.c | 6 +-
libavcodec/mpeg4video.h | 4 +-
libavcodec/mpeg4video_parser.c | 2 +-
libavcodec/mpeg4video_parser.h | 2 +-
libavcodec/mpeg4videodec.c | 24 +++----
libavcodec/mpeg4videoenc.c | 26 +++----
libavcodec/mpegaudiodec_template.c | 2 +-
libavcodec/mpegaudiodecheader.h | 2 +-
libavcodec/mpegaudioenc_template.c | 4 +-
libavcodec/mpegpicture.c | 4 +-
libavcodec/mpegvideo.c | 19 +++---
libavcodec/mpegvideo.h | 86 +++++++++++------------
libavcodec/mpegvideo_enc.c | 37 +++++-----
libavcodec/mpegvideo_motion.c | 2 +-
libavcodec/mpegvideo_parser.c | 2 +-
libavcodec/mqc.h | 4 +-
libavcodec/msmpeg4.c | 10 +--
libavcodec/msmpeg4dec.c | 4 +-
libavcodec/msmpeg4enc.c | 9 ++-
libavcodec/msrle.c | 2 +-
libavcodec/msvideo1.c | 2 +-
libavcodec/nuv.c | 4 +-
libavcodec/nvenc.c | 7 +-
libavcodec/nvenc_h264.c | 4 +-
libavcodec/omx.c | 8 +--
libavcodec/options_table.h | 2 +-
libavcodec/opus.c | 4 +-
libavcodec/pcm-dvd.c | 4 +-
libavcodec/pngdec.c | 2 +-
libavcodec/pthread_internal.h | 2 +-
libavcodec/qcelpdec.c | 2 +-
libavcodec/qdm2.c | 4 +-
libavcodec/qsvdec_mpeg2.c | 2 +-
libavcodec/qtrle.c | 2 +-
libavcodec/qtrleenc.c | 4 +-
libavcodec/ra144.c | 2 +-
libavcodec/ra144.h | 2 +-
libavcodec/ra144enc.c | 6 +-
libavcodec/ra288.c | 2 +-
libavcodec/ra288.h | 2 +-
libavcodec/ratecontrol.c | 10 +--
libavcodec/ratecontrol.h | 2 +-
libavcodec/rectangle.h | 2 +-
libavcodec/roqvideodec.c | 2 +-
libavcodec/roqvideoenc.c | 2 +-
libavcodec/rpza.c | 4 +-
libavcodec/rv10.c | 4 +-
libavcodec/rv10enc.c | 2 +-
libavcodec/rv34.c | 2 +-
libavcodec/rv34.h | 4 +-
libavcodec/screenpresso.c | 2 +-
libavcodec/simple_idct_template.c | 6 +-
libavcodec/smc.c | 2 +-
libavcodec/sp5x.h | 2 +-
libavcodec/svq1.c | 4 +-
libavcodec/svq1.h | 4 +-
libavcodec/svq1_cb.h | 4 +-
libavcodec/svq1_vlc.h | 2 +-
libavcodec/svq1dec.c | 4 +-
libavcodec/svq1enc.c | 2 +-
libavcodec/svq3.c | 2 +-
libavcodec/tdsc.c | 4 +-
libavcodec/texturedsp.c | 2 +-
libavcodec/texturedspenc.c | 4 +-
libavcodec/twinvq.h | 2 +-
libavcodec/twinvqdec.c | 2 +-
libavcodec/utvideoenc.c | 6 +-
libavcodec/vaapi_encode.c | 4 +-
libavcodec/vaapi_encode_h264.c | 8 +--
libavcodec/vaapi_encode_h265.c | 8 +--
libavcodec/vc1.c | 6 +-
libavcodec/vc1.h | 32 ++++-----
libavcodec/vc1_block.c | 8 +--
libavcodec/vc1_mc.c | 4 +-
libavcodec/vc1_pred.c | 2 +-
libavcodec/vc1dec.c | 2 +-
libavcodec/vdpau_h264.c | 4 +-
libavcodec/vp3.c | 12 ++--
libavcodec/vp3data.h | 2 +-
libavcodec/vp3dsp.c | 2 +-
libavcodec/vp8.h | 4 +-
libavcodec/vp9dsp.h | 2 +-
libavcodec/vqavideo.c | 2 +-
libavcodec/wma.c | 2 +-
libavcodec/wmadec.c | 6 +-
libavcodec/wmaenc.c | 2 +-
libavcodec/wmalosslessdec.c | 6 +-
libavcodec/wmavoice.c | 4 +-
libavcodec/wmv2enc.c | 2 +-
libavcodec/x86/cabac.h | 2 +-
libavcodec/x86/h264_chromamc.asm | 2 +-
libavcodec/x86/h264_i386.h | 2 +-
libavcodec/x86/inline_asm.h | 2 +-
libavcodec/x86/mpegvideo.c | 4 +-
libavcodec/x86/rv40dsp.asm | 10 +--
libavcodec/x86/vc1dsp_mmx.c | 12 ++--
libavcodec/xan.c | 2 +-
libavcodec/zmbv.c | 2 +-
libavdevice/x11grab.c | 2 +-
libavfilter/interlace.h | 2 +-
libavfilter/vf_gradfun.c | 6 +-
libavfilter/vf_hqdn3d.c | 2 +-
libavfilter/vf_overlay.c | 2 +-
libavformat/4xm.c | 2 +-
libavformat/aea.c | 2 +-
libavformat/amr.c | 4 +-
libavformat/asf.h | 2 +-
libavformat/asfdec_o.c | 4 +-
libavformat/asfenc.c | 4 +-
libavformat/avc.c | 2 +-
libavformat/avidec.c | 2 +-
libavformat/avio.h | 4 +-
libavformat/avisynth.c | 2 +-
libavformat/avlanguage.h | 2 +-
libavformat/bink.c | 2 +-
libavformat/bmv.c | 2 +-
libavformat/dump.c | 2 +-
libavformat/dv.c | 16 ++---
libavformat/dvenc.c | 4 +-
libavformat/electronicarts.c | 2 +-
libavformat/flic.c | 2 +-
libavformat/flvdec.c | 4 +-
libavformat/gxfenc.c | 2 +-
libavformat/httpauth.h | 2 +-
libavformat/id3v2enc.c | 2 +-
libavformat/idcin.c | 4 +-
libavformat/idroqdec.c | 2 +-
libavformat/internal.h | 2 +-
libavformat/ipmovie.c | 2 +-
libavformat/isom.c | 98 +++++++++++++--------------
libavformat/matroska.c | 2 +-
libavformat/matroska.h | 2 +-
libavformat/mms.c | 2 +-
libavformat/mmsh.c | 2 +-
libavformat/mmst.c | 4 +-
libavformat/mov.c | 6 +-
libavformat/movenc-test.c | 10 +--
libavformat/movenc.c | 6 +-
libavformat/mpeg.c | 4 +-
libavformat/mpeg.h | 2 +-
libavformat/mpegenc.c | 6 +-
libavformat/mpegts.c | 8 +--
libavformat/mpegts.h | 2 +-
libavformat/mpegtsenc.c | 10 +--
libavformat/mxf.c | 10 +--
libavformat/mxfdec.c | 16 ++---
libavformat/mxfenc.c | 12 ++--
libavformat/nsvdec.c | 8 +--
libavformat/oggparsedirac.c | 4 +-
libavformat/psxstr.c | 2 +-
libavformat/rdt.c | 2 +-
libavformat/rl2.c | 2 +-
libavformat/rmenc.c | 8 +--
libavformat/rtmphttp.c | 2 +-
libavformat/rtmpproto.c | 10 +--
libavformat/rtpdec.c | 2 +-
libavformat/rtpdec_h263_rfc2190.c | 2 +-
libavformat/rtpdec_h264.c | 10 +--
libavformat/rtpdec_mpeg4.c | 2 +-
libavformat/rtpdec_qt.c | 2 +-
libavformat/rtpdec_vp8.c | 2 +-
libavformat/rtpenc.c | 4 +-
libavformat/rtpenc.h | 2 +-
libavformat/rtpenc_h261.c | 4 +-
libavformat/rtpenc_h263_rfc2190.c | 4 +-
libavformat/rtpenc_jpeg.c | 2 +-
libavformat/rtpenc_xiph.c | 2 +-
libavformat/sdp.c | 2 +-
libavformat/segafilm.c | 2 +-
libavformat/sierravmd.c | 2 +-
libavformat/spdif.h | 4 +-
libavformat/spdifenc.c | 8 +--
libavformat/url.h | 2 +-
libavformat/wc3movie.c | 2 +-
libavformat/westwood_aud.c | 2 +-
libavformat/westwood_vqa.c | 4 +-
libavformat/wtvdec.c | 4 +-
libavresample/dither.h | 4 +-
libavresample/resample.c | 2 +-
libavutil/avassert.h | 2 +-
libavutil/avr32/intreadwrite.h | 2 +-
libavutil/avutil.h | 2 +-
libavutil/frame.h | 2 +-
libavutil/hwcontext.h | 4 +-
libavutil/md5.c | 2 +-
libavutil/opt.h | 2 +-
libavutil/pixfmt.h | 22 +++---
libavutil/x86/cpu.c | 2 +-
libswscale/output.c | 10 +--
libswscale/swscale.h | 2 +-
libswscale/swscale_internal.h | 116 ++++++++++++++++----------------
libswscale/x86/output.asm | 8 +--
libswscale/x86/scale.asm | 6 +-
tests/checkasm/h264pred.c | 6 +-
320 files changed, 870 insertions(+), 871 deletions(-)
Diff: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commitdiff;h=8ef57a0d6154119e1a616dd8c29e8c32e35808a0
More information about the ffmpeg-cvslog
mailing list