diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:09:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:17:07 +0200 |
| commit | d4d09329eef30787da699c7a397b00f6f96940bc (patch) | |
| tree | 3605d4e30063b924254a373e270026bca6436f11 /libavformat/img2.c | |
| parent | a61bc91d42945e6ccefef4867ef32d2073f8f8c7 (diff) | |
| parent | 0c68c804196400de3c40c8849124b292ed62b99c (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
lavf: bump minor and add an APIChanges entry for avformat cleanup
lavf: get rid of ffm-specific stuff in avformat.h
Not pulled: avio: deprecate av_protocol_next().
avio: add a function for iterating though protocol names.
lavf: rename a parameter of av_sdp_create from buff->buf
lavf: rename avf_sdp_create to av_sdp_create.
lavf: make av_guess_image2_codec internal
avio: make URLProtocol internal.
avio: make URLContext internal.
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
lavf: use designated initializers for all protocols
applehttp: don't use deprecated url_ functions.
avio: move two ff_udp_* functions from avio_internal to url.h
asfdec: remove a forgotten declaration of nonexistent function
avio: deprecate the typedef for URLInterruptCB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 4e55c22ccc..56c4b3b567 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -24,6 +24,7 @@ #include "libavutil/avstring.h" #include "avformat.h" #include "avio_internal.h" +#include "internal.h" #include <strings.h> typedef struct { @@ -185,9 +186,16 @@ static int read_probe(AVProbeData *p) return 0; } +enum CodecID ff_guess_image2_codec(const char *filename) +{ + return av_str2id(img_tags, filename); +} + +#if FF_API_GUESS_IMG2_CODEC enum CodecID av_guess_image2_codec(const char *filename){ return av_str2id(img_tags, filename); } +#endif static int read_header(AVFormatContext *s1, AVFormatParameters *ap) { |