• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2b6325ca
    Michael Niedermayer authored
    * qatar/master:
      h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
      h264: Make ff_h264_decode_end() static, it is not used externally.
      output-example: K&R formatting cosmetics, comment spelling fixes
      avf: make the example output the proper message
      avf: fix audio writing in the output-example
      mov: don't overwrite existing indexes.
      lzw: fix potential integer overflow.
      truemotion: forbid invalid VLC bitsizes and token values.
      truemotion2: handle out-of-frame motion vectors through edge extension.
      configure: Check for a different SDL function
    
    Conflicts:
    	configure
    	doc/examples/muxing.c
    	libavcodec/truemotion2.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2b6325ca
h264.c 186 KB