diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-07 19:58:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-07 20:01:36 +0200 |
| commit | 0739179bfb002324eea20f1c44c5f586b6bd3e04 (patch) | |
| tree | 106761bd7844229b1050ce4a0584ba6187532a69 /libavcodec/adpcm.h | |
| parent | 6fd300ac6c2c3871736ce0e6df95603255004dc6 (diff) | |
| parent | 108f2f381acb93827fb4add0517eeae859afa3bf (diff) | |
| download | ffmpeg-0739179bfb002324eea20f1c44c5f586b6bd3e04.tar.gz | |
Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'
* commit '108f2f381acb93827fb4add0517eeae859afa3bf':
parseutils: Extend small_strptime to be used in avformat
Conflicts:
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.h')
0 files changed, 0 insertions, 0 deletions