diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 01:17:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 01:19:24 +0100 |
| commit | d99653c9e444323841030b41e66accd5b36945e7 (patch) | |
| tree | b1664cd205296243000d90bd4ed18d6b89e27f25 /libavcodec/amr.h | |
| parent | 0960cc4cc60fa39a1de19f8f744274becb164bef (diff) | |
| parent | a1a259881fa7b23e2ffc0c2a43d4923fe42d0478 (diff) | |
| download | ffmpeg-d99653c9e444323841030b41e66accd5b36945e7.tar.gz | |
Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'
* commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478':
v4l2: Use av_strerror
Conflicts:
libavdevice/v4l2.c
See: 60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amr.h')
0 files changed, 0 insertions, 0 deletions