Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:38:27 +0000 (23:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:38:27 +0000 (23:38 +0200)
commit4a522eff006532f28c631f13a604c364102b7a6f
tree2c3f6f2f03019c7737273d551811b0c40bd04367
parent301522f521f05c998fb8dfba153d49e557604507
parentafc8685395e775fe0f2a1698b683aea4afd124af
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'

* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
  avf: split off format register and lookup function

Conflicts:
libavformat/utils.c

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