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

Merge remote branch 'qatar/master'


* qatar/master:
  vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
  applehttp: Don't export variant_bitrate if it isn't known
  crypto: Use av_freep instead of av_free
  configure: Add missing libm library dependencies to .pc files.
  oggdec: reindent after 8f3eebd6
  configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:
	configure

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 2671ab39 2441003d
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