[FFmpeg-cvslog] Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 16 23:38:27 2013 +0200| [4a522eff006532f28c631f13a604c364102b7a6f] | committer: Michael Niedermayer

Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'

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

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a522eff006532f28c631f13a604c364102b7a6f
---