diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 20:57:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 20:57:42 +0200 |
| commit | 80a3a6611fe5866163b2e64da7c492fff7874a03 (patch) | |
| tree | fb0d5f2036e844076f7d726ccbdaaefdd382fb7c /tools/uncoded_frame.c | |
| parent | 31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f (diff) | |
| parent | 3a19405d574a467c68b48e4b824c76617fd59de0 (diff) | |
| download | ffmpeg-80a3a6611fe5866163b2e64da7c492fff7874a03.tar.gz | |
Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'
* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
avformat: Use the mime type information in input probe
Conflicts:
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/uncoded_frame.c')
0 files changed, 0 insertions, 0 deletions