Merge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 00:40:03 +0000 (01:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 00:40:03 +0000 (01:40 +0100)
commit4574f11e4dd3e8cfd102c8c675e4de40f7532ce6
tree6b026738b29cf914a24e609842bc5770ab283902
parent2eb890aab22d9cc20df140615008a7c4eec9ac7b
parentb72b212a4c43563f1b9fc3ce9a5ff91f89b857ac
Merge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'

* commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac':
  rdt: Use a separate variable to clarify the different value namespaces

Conflicts:
libavformat/rdt.c

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