diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:48:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:49:19 +0200 |
| commit | 6145b1d9c11bb5261e4b5137ef31defacad56eb5 (patch) | |
| tree | 786abad09307ca729be4a42e693abaaa2f47e6bc /libavutil/channel_layout.c | |
| parent | 69505a89f1edcda4191d62149d801da6f48a6c27 (diff) | |
| parent | bf2064f046af64c59a416c814474a39b0a457569 (diff) | |
| download | ffmpeg-6145b1d9c11bb5261e4b5137ef31defacad56eb5.tar.gz | |
Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'
* commit 'bf2064f046af64c59a416c814474a39b0a457569':
tiffdec: rename variables for consistency and fix variable shadowing
Conflicts:
libavcodec/tiff.c
See: 251345a3fe221d60e9b275567085f9475de68092
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/channel_layout.c')
0 files changed, 0 insertions, 0 deletions