diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-23 01:18:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-23 01:18:51 +0100 |
| commit | 6d8dda169384e3935d38da2ed127ba82fd666ee7 (patch) | |
| tree | bc2b8f64da5b7b4bc364b5a5b74418aca3f97c3e /libavformat/amr.c | |
| parent | d899ea2017ef555f93939db3bac259f4c1df0672 (diff) | |
| parent | eec7f032a903e06d249d1e8aa6630b65292bf40f (diff) | |
| download | ffmpeg-6d8dda169384e3935d38da2ed127ba82fd666ee7.tar.gz | |
Merge commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f'
* commit 'eec7f032a903e06d249d1e8aa6630b65292bf40f':
lavf: Remove a redundant include of sys/stat.h
Conflicts:
libavformat/os_support.h
See: 49515cb8407ba237329280d99ab7e79a02560dfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions