Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 21:33:24 +0000 (23:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 22:56:23 +0000 (00:56 +0200)
commitf22f873ef013098d61d1e9fc311f5a373fb4f933
treee0875bed4d012b022b0a063c2701aa6d1b812b26
parentbb44f7d5d7e48bd67fa24fbec4a28f9890e444aa
parent20a5956b8daeee4cb59d6fa00ec809b02c04d7f8
Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'

* commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8':
  dump: split audio and video probing on multiple lines

Conflicts:
libavcodec/utils.c
libavformat/dump.c

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