[FFmpeg-cvslog] r23250 - in trunk/libavformat: caf.c caf.h flvenc.c internal.h isom.c isom.h nut.c nutenc.c riff.h voc.c vocdec.c vocenc.c

[cehoyos]

Author: cehoyos
Date: Sat May 22 18:01:32 2010
New Revision: 23250

Log:
Move AVCodecTag from riff.h into internal.h.

Patch by Francesco Lavra, francescolavra interfree it

Modified:
   trunk/libavformat/caf.c
   trunk/libavformat/caf.h
   trunk/libavformat/flvenc.c
   trunk/libavformat/internal.h
   trunk/libavformat/isom.c
   trunk/libavformat/isom.h
   trunk/libavformat/nut.c
   trunk/libavformat/nutenc.c
   trunk/libavformat/riff.h
   trunk/libavformat/voc.c
   trunk/libavformat/vocdec.c
   trunk/libavformat/vocenc.c

Modified: trunk/libavformat/caf.c
==============================================================================
--- trunk/libavformat/caf.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/caf.c	Sat May 22 18:01:32 2010	(r23250)
@@ -25,7 +25,7 @@
  */
 
 #include "avformat.h"
-#include "riff.h"
+#include "internal.h"
 #include "caf.h"
 
 /**

Modified: trunk/libavformat/caf.h
==============================================================================
--- trunk/libavformat/caf.h	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/caf.h	Sat May 22 18:01:32 2010	(r23250)
@@ -27,7 +27,7 @@
 #ifndef AVFORMAT_CAF_H
 #define AVFORMAT_CAF_H
 
-#include "riff.h"
+#include "internal.h"
 
 extern const AVCodecTag ff_codec_caf_tags[];
 

Modified: trunk/libavformat/flvenc.c
==============================================================================
--- trunk/libavformat/flvenc.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/flvenc.c	Sat May 22 18:01:32 2010	(r23250)
@@ -20,7 +20,7 @@
  */
 #include "avformat.h"
 #include "flv.h"
-#include "riff.h"
+#include "internal.h"
 #include "avc.h"
 
 #undef NDEBUG

Modified: trunk/libavformat/internal.h
==============================================================================
--- trunk/libavformat/internal.h	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/internal.h	Sat May 22 18:01:32 2010	(r23250)
@@ -24,6 +24,11 @@
 #include <stdint.h>
 #include "avformat.h"
 
+typedef struct AVCodecTag {
+    enum CodecID id;
+    unsigned int tag;
+} AVCodecTag;
+
 void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
 
 #ifdef __GNUC__

Modified: trunk/libavformat/isom.c
==============================================================================
--- trunk/libavformat/isom.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/isom.c	Sat May 22 18:01:32 2010	(r23250)
@@ -22,7 +22,7 @@
  */
 
 #include "avformat.h"
-#include "riff.h"
+#include "internal.h"
 #include "isom.h"
 
 /* http://www.mp4ra.org */

Modified: trunk/libavformat/isom.h
==============================================================================
--- trunk/libavformat/isom.h	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/isom.h	Sat May 22 18:01:32 2010	(r23250)
@@ -25,7 +25,7 @@
 #define AVFORMAT_ISOM_H
 
 #include "avio.h"
-#include "riff.h"
+#include "internal.h"
 #include "dv.h"
 
 /* isom.c */

Modified: trunk/libavformat/nut.c
==============================================================================
--- trunk/libavformat/nut.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/nut.c	Sat May 22 18:01:32 2010	(r23250)
@@ -21,6 +21,7 @@
 
 #include "libavutil/tree.h"
 #include "nut.h"
+#include "internal.h"
 
 const AVCodecTag ff_nut_subtitle_tags[] = {
     { CODEC_ID_TEXT        , MKTAG('U', 'T', 'F', '8') },

Modified: trunk/libavformat/nutenc.c
==============================================================================
--- trunk/libavformat/nutenc.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/nutenc.c	Sat May 22 18:01:32 2010	(r23250)
@@ -23,6 +23,7 @@
 #include "libavutil/tree.h"
 #include "libavcodec/mpegaudiodata.h"
 #include "nut.h"
+#include "internal.h"
 
 static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
     int sample_rate= c->sample_rate;

Modified: trunk/libavformat/riff.h
==============================================================================
--- trunk/libavformat/riff.h	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/riff.h	Sat May 22 18:01:32 2010	(r23250)
@@ -30,15 +30,11 @@
 
 #include "libavcodec/avcodec.h"
 #include "avio.h"
+#include "internal.h"
 
 int64_t ff_start_tag(ByteIOContext *pb, const char *tag);
 void ff_end_tag(ByteIOContext *pb, int64_t start);
 
-typedef struct AVCodecTag {
-    enum CodecID id;
-    unsigned int tag;
-} AVCodecTag;
-
 void ff_put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
 int ff_put_wav_header(ByteIOContext *pb, AVCodecContext *enc);
 enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps);

Modified: trunk/libavformat/voc.c
==============================================================================
--- trunk/libavformat/voc.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/voc.c	Sat May 22 18:01:32 2010	(r23250)
@@ -20,6 +20,7 @@
  */
 
 #include "voc.h"
+#include "internal.h"
 
 const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A";
 

Modified: trunk/libavformat/vocdec.c
==============================================================================
--- trunk/libavformat/vocdec.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/vocdec.c	Sat May 22 18:01:32 2010	(r23250)
@@ -21,6 +21,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "voc.h"
+#include "internal.h"
 
 
 static int voc_probe(AVProbeData *p)

Modified: trunk/libavformat/vocenc.c
==============================================================================
--- trunk/libavformat/vocenc.c	Sat May 22 17:56:49 2010	(r23249)
+++ trunk/libavformat/vocenc.c	Sat May 22 18:01:32 2010	(r23250)
@@ -20,6 +20,7 @@
  */
 
 #include "voc.h"
+#include "internal.h"
 
 
 typedef struct voc_enc_context {