diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 14:14:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 14:14:33 +0200 |
| commit | 4f32efdff007024869ab2755c9223c159ace4442 (patch) | |
| tree | f132cf9e5e668d498b8ff4c021a419a9568e3c8c /libavformat/avformat.h | |
| parent | 4fac4447d153b2a8e88ce7274b851459d7cd93f6 (diff) | |
| parent | c3311d472a7528c67f76d0d061704ae70a99b32e (diff) | |
Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'
* commit 'c3311d472a7528c67f76d0d061704ae70a99b32e':
avienc: sanitize variable naming in write_header()
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
0 files changed, 0 insertions, 0 deletions