diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:18:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:18:25 +0100 |
| commit | f0ce3854fda36fd67b59421aec939f32a4910515 (patch) | |
| tree | 3e5a19c2f8e3176eddfe278e9a50d7733b83d788 /libavcodec/arm/simple_idct_arm.S | |
| parent | cd88d89493d3988c990d815e9b2a9b8c3a5f6743 (diff) | |
| parent | bc6461c2861b7d482a037d3b3e2b44ad48805fa0 (diff) | |
| download | ffmpeg-f0ce3854fda36fd67b59421aec939f32a4910515.tar.gz | |
Merge commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0'
* commit 'bc6461c2861b7d482a037d3b3e2b44ad48805fa0':
af_compand: replace strtok_r() with av_get_token()
Conflicts:
configure
libavfilter/af_compand.c
Not merged as requested by ubitux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/simple_idct_arm.S')
0 files changed, 0 insertions, 0 deletions