diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:10:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:10:07 +0200 |
| commit | ea28034f5d35652ff6a174929fe3ecdbd0cbad35 (patch) | |
| tree | f3ae4a4d63a36bc551df04fba518fb0a57629448 /libavutil/parseutils.c | |
| parent | 6452b3159982565a56621f1d5a77b6a6e5306f70 (diff) | |
| parent | ff79f6b35a94dde69b3d52bd2abdfdb793f525c3 (diff) | |
| download | ffmpeg-ea28034f5d35652ff6a174929fe3ecdbd0cbad35.tar.gz | |
Merge commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3' into release/2.2
* commit 'ff79f6b35a94dde69b3d52bd2abdfdb793f525c3':
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions