Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 17:55:15 +0000 (19:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 18:02:09 +0000 (20:02 +0200)
commite066f01539fd2ed19bda2031c43ddf266f0a000a
tree5f65f5d9630702ee2f8225b8318c02a483a131f5
parent0c889da8cb53a7e26d5303ad00699c92d636e831
parente253a9e2b3d683eb51db7c776326eb07de10ad4c
Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'

* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
  avformat: Move av_probe_input* to format.c

Conflicts:
libavformat/format.c
libavformat/utils.c

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