[SCM] libav/experimental: move declaration to mov.h
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:47:28 UTC 2013
The following commit has been merged in the experimental branch:
commit 98d12b09aff3f34d42a91db6a60452955e621494
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Wed Apr 19 10:02:41 2006 +0000
move declaration to mov.h
Originally committed as revision 5299 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6863f39..b503d2c 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -382,7 +382,6 @@ static int ff_mov_lang_to_iso639(int code, char *to)
return 1;
}
-extern int ff_mov_iso639_to_lang(const char *lang, int mp4); /* for movenc.c */
int ff_mov_iso639_to_lang(const char *lang, int mp4)
{
int i, code = 0;
diff --git a/libavformat/mov.h b/libavformat/mov.h
index e7a999b..8b87c41 100644
--- a/libavformat/mov.h
+++ b/libavformat/mov.h
@@ -3,6 +3,7 @@
/* mov.c */
extern const CodecTag ff_mov_obj_type[];
+extern int ff_mov_iso639_to_lang(const char *lang, int mp4);
typedef struct Time2Sample{
int count;
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index af007ba..f59ea25 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -76,9 +76,6 @@ typedef struct MOVContext {
static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track);
-/* output language code from iso639 language name */
-extern int ff_mov_iso639_to_lang(const char *lang, int mp4);
-
//FIXME supprt 64bit varaint with wide placeholders
static offset_t updateSize (ByteIOContext *pb, offset_t pos)
{
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list