[FFmpeg-cvslog] lavf: make av_guess_image2_codec internal

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Apr  5 13:13:53 2011 +0200| [a9bf9d8e5349114d37cc3baf0b1e7d95197c5ef8] | committer: Anton Khirnov

lavf: make av_guess_image2_codec internal

It doesn't look very useful as a public function.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9bf9d8e5349114d37cc3baf0b1e7d95197c5ef8
---

 libavformat/avformat.h |    4 +++-
 libavformat/img2.c     |    8 ++++++++
 libavformat/internal.h |    2 ++
 libavformat/utils.c    |    4 ++--
 libavformat/version.h  |    3 +++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 6b1b2b4..37ec8a9 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 59d9150..2b5d63b 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 7528dae..9bc2340 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 ca582b3..1d58682 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 512195e..cfe1f82 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