Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

[ffmpeg] / libavformat / ffmetaenc.c

diff --git a/libavformat/ffmetaenc.c b/libavformat/ffmetaenc.c
index 17e1d6f499b28e84af084b3bc883b37b6088f0dd..b20abc9036f45fcfc7ff2a992f5e1fcfea90e97c 100644 (file)
--- a/libavformat/ffmetaenc.c
+++ b/libavformat/ffmetaenc.c
@@ -19,8 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <inttypes.h>
+
 #include "avformat.h"
-#include "meta.h"
+#include "ffmeta.h"
 
 
 static void write_escape_str(ByteIOContext *s, const uint8_t *str)
@@ -72,8 +74,8 @@ static int write_trailer(AVFormatContext *s)
         put_tag(s->pb, ID_CHAPTER);
         put_byte(s->pb, '\n');
         url_fprintf(s->pb, "TIMEBASE=%d/%d\n", ch->time_base.num, ch->time_base.den);
-        url_fprintf(s->pb, "START=%lld\n", ch->start);
-        url_fprintf(s->pb, "END=%lld\n",   ch->end);
+        url_fprintf(s->pb, "START=%"PRId64"\n", ch->start);
+        url_fprintf(s->pb, "END=%"PRId64"\n",   ch->end);
         write_tags(s->pb, ch->metadata);
     }
 
@@ -87,7 +89,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-AVOutputFormat ffmetadata_muxer = {
+AVOutputFormat ff_ffmetadata_muxer = {
     .name          = "ffmetadata",
     .long_name     = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"),
     .extensions    = "ffmeta",