-
Michael Niedermayer authored
* commit 'b72b212a': rdt: Use a separate variable to clarify the different value namespaces Conflicts: libavformat/rdt.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
4574f11e
* commit 'b72b212a': rdt: Use a separate variable to clarify the different value namespaces Conflicts: libavformat/rdt.c Merged-by:Michael Niedermayer <michaelni@gmx.at>