Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Aug 2012 12:55:58 +0000 (14:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Aug 2012 12:55:58 +0000 (14:55 +0200)
commitc9fe864472a2c55c7c4189ff6fb490bec8bd92b3
treee6b713039096a079b01f66237e8516bdee893f2d
parent5980e57cf9a08ca284bc1b5ffba2363f9eff8ca8
parent4855022aa11ec7aa1a3bd9797814e84795634abe
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vorbisdec: remove some pointless comments
  avprobe: add const to AVCodec pointer
  libavformat: add const to AVCodec pointers
  pthread: add const to AVCodec pointers

Conflicts:
ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffprobe.c
libavcodec/pthread.c
libavcodec/vorbisdec.c
libavformat/utils.c