• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a72580fc
    Michael Niedermayer authored
    * qatar/master:
      binkvideo: simplify and remove invalid shifts
      pulse: compute frame_duration once and fix it
      lavf: simplify format_child_class_next()
      hwaccel: OS X Video Decoder Acceleration (VDA) support.
      doc: add support for an optional navigation bar in texi2html pages
    
    Conflicts:
    	configure
    	libavcodec/Makefile
    	libavcodec/allcodecs.c
    	libavcodec/vda.c
    	libavcodec/vda.h
    	libavcodec/vda_h264.c
    	libavcodec/vda_internal.h
    	libavcodec/version.h
    	libavformat/options.c
    	libavutil/avutil.h
    	libavutil/pixfmt.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a72580fc
pulse.c 6.33 KB