Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 11:38:28 +0000 (13:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 11:39:23 +0000 (13:39 +0200)
commit44f079b27e8141c3871327c81d054777413fa49a
treea87d424eca7497f6be9b7b94193cce2fe2d900d6
parent982920cfaa40d5b575225fc2baaf03f6250f7a03
parentcdab9db2adeec46b3984309c8c651bdd737d2b6b
Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'

* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
libavformat/avformat.h

See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avformat.h