diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:57:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:57:10 +0200 |
commit | 5717562c789f9be9c8e4bab7caec4df83f77cebe (patch) | |
tree | 134e045d40aa79aca5d42fd00c72f317cf519a2d /version.sh | |
parent | 25f3827e1daf6b75e6b46e2bccaf8cbc273d6b42 (diff) | |
parent | c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d (diff) | |
download | ffmpeg-streaming-5717562c789f9be9c8e4bab7caec4df83f77cebe.zip ffmpeg-streaming-5717562c789f9be9c8e4bab7caec4df83f77cebe.tar.gz |
Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
rangecoder-test: Return in case of an error
build: simplify enabling of compat objects
Conflicts:
configure
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions