• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8e2bab5d
    Michael Niedermayer authored
    * qatar/master:
      drawtext: remove typo
      pcm-mpeg: implement new audio decoding api
      w32thread: port fixes to pthread_cond_broadcast() from x264.
      doc: add editor configuration section with Vim and Emacs settings
      dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
      avformat/utils: Drop unused goto label.
      doxygen: Replace '\' by '@' in Doxygen markup tags.
      cosmetics: drop some completely pointless parentheses
      cljr: simplify CLJRContext
      drawtext: introduce rand(min, max)
      drawtext: introduce explicit draw/hide variable
      rtmp: Use nb_invokes for all invoke commands
    
    Conflicts:
    	libavcodec/mpegvideo.c
    	libavfilter/vf_drawtext.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8e2bab5d
libdc1394.c 13.4 KB