Merge commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:02:56 +0000 (23:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 21:02:56 +0000 (23:02 +0200)
commitf01a1281ee82c82f64f1879d99cce3807f5fcf05
tree13b563fd6123d9f8052b54e9311bb9bc8c8f2923
parent313d75cd4300316f6c8de7ef3473275f454e986a
parent019d3fccc4dcf5c8379112f697ce9eb08edee9b9
Merge commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9'

* commit '019d3fccc4dcf5c8379112f697ce9eb08edee9b9':
  Set protocol-level metadata in AVFormatContext any time a packet is read.

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c