Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Dec 2011 23:45:02 +0000 (00:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Dec 2011 23:45:02 +0000 (00:45 +0100)
commitbba6f5b77f69e0b7fb00b3f346422715fc602f55
tree3b1a17486c377e86daf4141e7900676fe6461332
parentad9e0ed170234bc6c5660f96752777965081163e
parent8b94df0f2047e9728cb872adc9e64557b7a5152f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp3dec: Check coefficient index in vp3_dequant()
  svq1dec: call avcodec_set_dimensions() after dimensions changed.
  Prepare for 0.8_beta1 snapshot release
  threads: check defines before using them in automatic thread detection
  pthread: include sys/types.h before sys/sysctl.h
  4xm: remove unused variables.
  h264: Fix a possible overread in decode_nal_units()
  allfilters: fix type of avfilter_vsrc_buffer.
  w32thread: call ResetEvent() in pthread_cond_broadcast().

Conflicts:
Changelog
RELEASE
doc/RELEASE_NOTES
libavcodec/pthread.c
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/RELEASE_NOTES
libavcodec/4xm.c
libavcodec/h264.c
libavcodec/vp3.c
libavfilter/allfilters.c