• Michael Niedermayer's avatar
    Merge commit 'b522000e' · de31814a
    Michael Niedermayer authored
    * commit 'b522000e
    
    ':
      avio: introduce avio_closep
      mpegtsenc: set muxing type notification to verbose
      vc1dec: Use correct spelling of "opposite"
      a64multienc: change mc_frame_counter to unsigned
      arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
      svq1: Drop a bunch of useless parentheses
      parseutils-test: do not print numerical error codes
      svq1: K&R formatting cosmetics
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/svq1dec.c
    	libavcodec/svq1enc.c
    	libavformat/version.h
    	libavutil/parseutils.c
    	tests/ref/fate/parseutils
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    de31814a