diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-31 13:08:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-31 13:35:55 +0100 |
| commit | 532ca12300f149a91090270ac733c52c4573ec88 (patch) | |
| tree | b174e1b759455fe62ff7d3e8c122258fc33a3557 /libavformat/riffdec.c | |
| parent | fa6fa2162b730336fc1d6ee0d547dcc81f4afbad (diff) | |
| parent | c7f25d4c7f6504db1265d711822885331dd3ad4c (diff) | |
| download | ffmpeg-532ca12300f149a91090270ac733c52c4573ec88.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Ensure that strip commands are run silently
Conflicts:
Makefile
Not merged as it conflicts with strip being on the BRIEF list
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riffdec.c')
0 files changed, 0 insertions, 0 deletions