Browse code

lavf: rename meta.h->ffmeta.h for consistency.

Originally committed as revision 26211 to svn://svn.ffmpeg.org/ffmpeg/trunk

Anton Khirnov authored on 2011/01/04 21:35:39
Showing 4 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,29 @@
0
+/*
1
+ * Common data for metadata muxer/demuxer
2
+ * Copyright (c) 2010 Anton Khirnov
3
+ *
4
+ * This file is part of FFmpeg.
5
+ *
6
+ * FFmpeg is free software; you can redistribute it and/or
7
+ * modify it under the terms of the GNU Lesser General Public
8
+ * License as published by the Free Software Foundation; either
9
+ * version 2.1 of the License, or (at your option) any later version.
10
+ *
11
+ * FFmpeg is distributed in the hope that it will be useful,
12
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
+ * Lesser General Public License for more details.
15
+ *
16
+ * You should have received a copy of the GNU Lesser General Public
17
+ * License along with FFmpeg; if not, write to the Free Software
18
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
+ */
20
+
21
+#ifndef AVFORMAT_META_H
22
+#define AVFORMAT_META_H
23
+
24
+#define ID_STRING  ";FFMETADATA"
25
+#define ID_CHAPTER "[CHAPTER]"
26
+#define ID_STREAM  "[STREAM]"
27
+
28
+#endif /* AVFORMAT_META_H */
... ...
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 #include "avformat.h"
23
-#include "meta.h"
23
+#include "ffmeta.h"
24 24
 
25 25
 static int probe(AVProbeData *p)
26 26
 {
... ...
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 #include "avformat.h"
23
-#include "meta.h"
23
+#include "ffmeta.h"
24 24
 
25 25
 
26 26
 static void write_escape_str(ByteIOContext *s, const uint8_t *str)
27 27
deleted file mode 100644
... ...
@@ -1,29 +0,0 @@
1
-/*
2
- * Common data for metadata muxer/demuxer
3
- * Copyright (c) 2010 Anton Khirnov
4
- *
5
- * This file is part of FFmpeg.
6
- *
7
- * FFmpeg is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU Lesser General Public
9
- * License as published by the Free Software Foundation; either
10
- * version 2.1 of the License, or (at your option) any later version.
11
- *
12
- * FFmpeg is distributed in the hope that it will be useful,
13
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15
- * Lesser General Public License for more details.
16
- *
17
- * You should have received a copy of the GNU Lesser General Public
18
- * License along with FFmpeg; if not, write to the Free Software
19
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
- */
21
-
22
-#ifndef AVFORMAT_META_H
23
-#define AVFORMAT_META_H
24
-
25
-#define ID_STRING  ";FFMETADATA"
26
-#define ID_CHAPTER "[CHAPTER]"
27
-#define ID_STREAM  "[STREAM]"
28
-
29
-#endif /* AVFORMAT_META_H */