diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 10:45:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 10:45:37 +0200 |
| commit | 3d5a995eac2a47ac116c3412b364c0d21717829b (patch) | |
| tree | 868ccd797d79473c7e382765a1ebc58ff367c969 /libavcodec/imc.c | |
| parent | c1488fab3dd402d6d26b2b9124ab448715a8f01f (diff) | |
| parent | e52567c2954f627d420b30f75f71af2f2e4afe80 (diff) | |
| download | ffmpeg-3d5a995eac2a47ac116c3412b364c0d21717829b.tar.gz | |
Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'
* commit 'e52567c2954f627d420b30f75f71af2f2e4afe80':
build: Strip spurious labels
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imc.c')
0 files changed, 0 insertions, 0 deletions