diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-05 13:13:53 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-08 16:44:29 +0200 |
| commit | a9bf9d8e5349114d37cc3baf0b1e7d95197c5ef8 (patch) | |
| tree | 3ef40cf17dcad4d59b54ceeacadc1621a67e0eb6 | |
| parent | 5593f031489f54ad184dd2d2744e31006c8627a5 (diff) | |
| download | ffmpeg-a9bf9d8e5349114d37cc3baf0b1e7d95197c5ef8.tar.gz | |
lavf: make av_guess_image2_codec internal
It doesn't look very useful as a public function.
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/img2.c | 8 | ||||
| -rw-r--r-- | libavformat/internal.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
5 files changed, 18 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6b1b2b493d..37ec8a9bee 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -899,7 +899,9 @@ AVInputFormat *av_iformat_next(AVInputFormat *f); */ AVOutputFormat *av_oformat_next(AVOutputFormat *f); -enum CodecID av_guess_image2_codec(const char *filename); +#if FF_API_GUESS_IMG2_CODEC +attribute_deprecated enum CodecID av_guess_image2_codec(const char *filename); +#endif /* XXX: Use automatic init with either ELF sections or C file parser */ /* modules. */ diff --git a/libavformat/img2.c b/libavformat/img2.c index 59d9150cdf..2b5d63b0bd 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 { @@ -183,9 +184,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) { diff --git a/libavformat/internal.h b/libavformat/internal.h index 7528dae4eb..9bc23402a4 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -250,4 +250,6 @@ void ff_reduce_index(AVFormatContext *s, int stream_index); void ff_make_absolute_url(char *buf, int size, const char *base, const char *rel); +enum CodecID ff_guess_image2_codec(const char *filename); + #endif /* AVFORMAT_INTERNAL_H */ diff --git a/libavformat/utils.c b/libavformat/utils.c index ca582b34df..1d58682a66 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -218,7 +218,7 @@ AVOutputFormat *av_guess_format(const char *short_name, const char *filename, #if CONFIG_IMAGE2_MUXER if (!short_name && filename && av_filename_number_test(filename) && - av_guess_image2_codec(filename) != CODEC_ID_NONE) { + ff_guess_image2_codec(filename) != CODEC_ID_NONE) { return av_guess_format("image2", NULL, NULL); } #endif @@ -271,7 +271,7 @@ enum CodecID av_guess_codec(AVOutputFormat *fmt, const char *short_name, #if CONFIG_IMAGE2_MUXER if(!strcmp(fmt->name, "image2") || !strcmp(fmt->name, "image2pipe")){ - codec_id= av_guess_image2_codec(filename); + codec_id= ff_guess_image2_codec(filename); } #endif if(codec_id == CODEC_ID_NONE) diff --git a/libavformat/version.h b/libavformat/version.h index 512195e82f..cfe1f82393 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -104,5 +104,8 @@ #ifndef FF_API_PKT_DUMP #define FF_API_PKT_DUMP (LIBAVFORMAT_VERSION_MAJOR < 54) #endif +#ifndef FF_API_GUESS_IMG2_CODEC +#define FF_API_GUESS_IMG2_CODEC (LIBAVFORMAT_VERSION_MAJOR < 54) +#endif #endif //AVFORMAT_VERSION_H |