Merge commit '7d97511e13ef30cd99bae0e36400de055b72918d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 10:04:51 +0000 (12:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 10:04:51 +0000 (12:04 +0200)
commitdceebe1a60b148028933cc47a6d92b0738919cfe
treec12aae8c32b547fa62e4d7322bc1969648a9f822
parent27f6da292118850ca7900de64d06b56e0ebb5070
parent7d97511e13ef30cd99bae0e36400de055b72918d
Merge commit '7d97511e13ef30cd99bae0e36400de055b72918d'

* commit '7d97511e13ef30cd99bae0e36400de055b72918d':
  configure: Add -lrt dependency to avutil's pc file.

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure