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 /libavformat/version.h | |
| parent | 31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f (diff) | |
| parent | 3a19405d574a467c68b48e4b824c76617fd59de0 (diff) | |
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 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 5ad23380fb..573eb1ccc8 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -85,4 +85,8 @@ #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 #endif +#ifndef FF_API_PROBE_MIME +#define FF_API_PROBE_MIME (LIBAVFORMAT_VERSION_MAJOR > 55) +#endif + #endif /* AVFORMAT_VERSION_H */ |