diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 20:58:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 20:58:33 +0100 |
| commit | 81e3f819bd1b1bf6aff7a8adf3f50262f383b9f9 (patch) | |
| tree | e5df6cc5fe538a1a9b04327a755c454c48e70f68 /libavutil/parseutils.c | |
| parent | 2c0bf76bb3358544e77a1383528d69fb76e96101 (diff) | |
| parent | 52f954da7594c31ad94c9bcb54290145b59b27f5 (diff) | |
| download | ffmpeg-81e3f819bd1b1bf6aff7a8adf3f50262f383b9f9.tar.gz | |
Merge commit '52f954da7594c31ad94c9bcb54290145b59b27f5'
* commit '52f954da7594c31ad94c9bcb54290145b59b27f5':
libavcodec: Unconditionally build xiph.o
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions