diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 01:40:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 01:40:03 +0100 |
| commit | 4574f11e4dd3e8cfd102c8c675e4de40f7532ce6 (patch) | |
| tree | 6b026738b29cf914a24e609842bc5770ab283902 /libavcodec | |
| parent | 2eb890aab22d9cc20df140615008a7c4eec9ac7b (diff) | |
| parent | b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac (diff) | |
| download | ffmpeg-4574f11e4dd3e8cfd102c8c675e4de40f7532ce6.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions