[FFmpeg-cvslog] Merge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  5 01:40:03 2015 +0100| [4574f11e4dd3e8cfd102c8c675e4de40f7532ce6] | committer: Michael Niedermayer

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 at gmx.at>

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