Michael Niedermayer 4a522eff00 Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af' ...

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

Conflicts:
	libavformat/utils.c

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

2013-06-16 23:38:27 +02:00

4.9 KiB

Raw Blame History

View Raw