diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 10:18:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 10:18:41 +0200 |
| commit | fbede75a2580ed3561128fcaef206f58be3b010f (patch) | |
| tree | ae919096f934acc1b03b591b45d4cfc65604774d /libavformat/mpjpeg.c | |
| parent | d82729e5d929ba2a5bb421825c40c31d96f91c27 (diff) | |
| parent | 768e44d044bc32de1e58c198a3708d186af7e966 (diff) | |
| download | ffmpeg-fbede75a2580ed3561128fcaef206f58be3b010f.tar.gz | |
Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'
* commit '768e44d044bc32de1e58c198a3708d186af7e966':
build: tune down the output of lcov/gcov
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpjpeg.c')
0 files changed, 0 insertions, 0 deletions