• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c130428a
    Michael Niedermayer authored
    * qatar/master:
      avprobe, cmdutils: K&R formatting cosmetics
      tests: K&R formatting cosmetics for test programs
      lavf: free packets for muxers implementing interleave_packet().
      lavf: fix and extend av_interleaved_write_frame() doxy.
      mov: Remove dead stores for spherical coordinates for channel position.
      error_resilience: K&R formatting cosmetics
      RELEASE_NOTES: mention hiding private symbols in shared builds.
      RELEASE_NOTES: mention some notable API changes in 0.8
    
    Conflicts:
    	cmdutils.h
    	doc/RELEASE_NOTES
    	ffprobe.c
    	libavcodec/error_resilience.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c130428a
rotozoom.c 7.78 KB