Michael Niedermayer c9fe864472 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>

2012-08-19 14:55:58 +02:00

156 KiB

Raw Blame History

View Raw