Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:18:17 +0000 (11:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:18:17 +0000 (11:18 +0200)
commit579a137897993e474af08499bd4c2ae62f4e9880
tree7ff32820367148a5b85af24f119608753233f80d
parent87e8cbf70931b789efc04c978082fc5181a51a26
parent880391ed2d2faf796ca3a16f63cec69767546a21
Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'

* commit '880391ed2d2faf796ca3a16f63cec69767546a21':
  libavutil: use avpriv_open()

Conflicts:
libavutil/random_seed.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/random_seed.c