• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8bc7fe4d
    Michael Niedermayer authored
    * qatar/master:
      doxygen: misc consistency, spelling and wording fixes
      vcr1: drop unnecessary emms_c() calls without MMX code
      Replace all uses of av_close_input_file() with avformat_close_input().
      lavf: add avformat_close_input().
      lavf: deprecate av_close_input_stream().
      lavf doxy: add some basic demuxing documentation.
      lavf doxy: add some general lavf information.
      lavf doxy: add misc utility functions to a group.
      lavf doxy: add av_guess_codec/format to the encoding group.
      lavf doxy: add core functions to a doxy group.
      Add basic libavdevice documentation.
      lavc: convert error_recognition to err_recognition.
      avconv: update -map option help text
      x86: Require 7 registers for the cabac asm
      x86: bswap: remove test for bswap instruction
      bswap: make generic implementation more compiler-friendly
      h264: remove useless cast
      proresdec: fix decode_slice() prototype
    
    Conflicts:
    	configure
    	doc/APIchanges
    	ffprobe.c
    	libavcodec/avcodec.h
    	libavcodec/celp_math.h
    	libavcodec/h264.c
    	libavfilter/src_movie.c
    	libavformat/anm.c
    	libavformat/avformat.h
    	libavformat/version.h
    	libavutil/avstring.h
    	libavutil/bswap.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8bc7fe4d
h264_cabac.c 112 KB