diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 14:54:36 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 14:54:36 +0400 |
| commit | f0fbd9105bc1edbd40fc06246aded92a9a6a5d3a (patch) | |
| tree | 84fe42f126248dfd51b491e63d617a5d028376df /.gitignore | |
| parent | 7b7afaf849efcc8dc68eea09d3e6ab03dbb68acf (diff) | |
| parent | 711aa2a82727907f778fb8aa9a93aff2120170f2 (diff) | |
Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'
* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
lavf: dump stream side data when probing
Conflicts:
libavformat/dump.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions