diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 23:33:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-09 00:56:23 +0200 |
| commit | f22f873ef013098d61d1e9fc311f5a373fb4f933 (patch) | |
| tree | e0875bed4d012b022b0a063c2701aa6d1b812b26 /arch.mak | |
| parent | bb44f7d5d7e48bd67fa24fbec4a28f9890e444aa (diff) | |
| parent | 20a5956b8daeee4cb59d6fa00ec809b02c04d7f8 (diff) | |
| download | ffmpeg-f22f873ef013098d61d1e9fc311f5a373fb4f933.tar.gz | |
Merge commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8'
* commit '20a5956b8daeee4cb59d6fa00ec809b02c04d7f8':
dump: split audio and video probing on multiple lines
Conflicts:
libavcodec/utils.c
libavformat/dump.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions