Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 23:23:37 +0000 (00:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 23:23:37 +0000 (00:23 +0100)
commit8e2bab5d4bddb4029503c0f90623854948ddb3c5
tree33a095ce0e92ed353c96c9b25b746ee45a2a00c7
parent7023fb81c78e10a6a7af6e6bc8902f99da81c458
parent78212cefe14a2086dc1ea3778b76623b949e5d0c
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
doc/developer.texi
libavcodec/atrac3.c
libavcodec/cljr.c
libavcodec/dxva2.h
libavcodec/mpegvideo.c
libavcodec/mpegvideo_common.h
libavcodec/msrledec.c
libavcodec/pcm-mpeg.c
libavcodec/ppc/h264_altivec.c
libavcodec/ppc/util_altivec.h
libavcodec/tableprint.h
libavcodec/vc1dec.c
libavdevice/libdc1394.c
libavfilter/vf_drawtext.c
libavformat/rtmpproto.c
libavformat/utils.c
libavutil/lzo.h