Skip to content
Snippets Groups Projects
Commit c9fe8644 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5980e57c 4855022a
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment