diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 04:23:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 04:24:02 +0100 |
| commit | 4014b401b0d55f27b7c430962b63f6b3fbf834c5 (patch) | |
| tree | aa3997c301c7b7fd542f2f35015cfd152538d33a /.gitignore | |
| parent | a493f8541de20e76073433f39f66da31f3834bc4 (diff) | |
| parent | f9c2d4d17e3b18becb046d71811f9e8aa5946cf9 (diff) | |
| download | ffmpeg-streaming-4014b401b0d55f27b7c430962b63f6b3fbf834c5.zip ffmpeg-streaming-4014b401b0d55f27b7c430962b63f6b3fbf834c5.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow decoding of slightly broken Nikon avi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions
