From 14fa75eab4e410858476cdcac8a1ec8b27f8a221 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 4 Jan 2011 12:35:39 +0000 Subject: [PATCH] lavf: rename meta.h->ffmeta.h for consistency. Originally committed as revision 26211 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/{meta.h => ffmeta.h} | 0 libavformat/ffmetadec.c | 2 +- libavformat/ffmetaenc.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename libavformat/{meta.h => ffmeta.h} (100%) diff --git a/libavformat/meta.h b/libavformat/ffmeta.h similarity index 100% rename from libavformat/meta.h rename to libavformat/ffmeta.h diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index 0269ac5a0b..66ad953a0d 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "meta.h" +#include "ffmeta.h" static int probe(AVProbeData *p) { diff --git a/libavformat/ffmetaenc.c b/libavformat/ffmetaenc.c index 17e1d6f499..f42a2b3f99 100644 --- a/libavformat/ffmetaenc.c +++ b/libavformat/ffmetaenc.c @@ -20,7 +20,7 @@ */ #include "avformat.h" -#include "meta.h" +#include "ffmeta.h" static void write_escape_str(ByteIOContext *s, const uint8_t *str)