[SCM] libav/experimental: move framecrc muxer in its own file

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6b6adf2bc86ba4b432554c054ef0470ba34d74ac
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Sun Oct 28 22:08:09 2007 +0000

    move framecrc muxer in its own file
    
    Originally committed as revision 10868 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index cf8a042..2efcbc3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -50,7 +50,7 @@ OBJS-$(CONFIG_FLIC_DEMUXER)              += flic.o
 OBJS-$(CONFIG_FLV_DEMUXER)               += flvdec.o
 OBJS-$(CONFIG_FLV_MUXER)                 += flvenc.o
 OBJS-$(CONFIG_FOURXM_DEMUXER)            += 4xm.o
-OBJS-$(CONFIG_FRAMECRC_MUXER)            += crc.o
+OBJS-$(CONFIG_FRAMECRC_MUXER)            += framecrcenc.o
 OBJS-$(CONFIG_GIF_MUXER)                 += gif.o
 OBJS-$(CONFIG_GIF_DEMUXER)               += gifdec.o
 OBJS-$(CONFIG_GXF_DEMUXER)               += gxf.o
diff --git a/libavformat/crc.c b/libavformat/crc.c
index bdbe8bc..7b16227 100644
--- a/libavformat/crc.c
+++ b/libavformat/crc.c
@@ -1,5 +1,5 @@
 /*
- * CRC decoder (for codec/format testing)
+ * CRC encoder (for codec/format testing)
  * Copyright (c) 2002 Fabrice Bellard.
  *
  * This file is part of FFmpeg.
@@ -21,7 +21,6 @@
 #include "avformat.h"
 #include "adler32.h"
 
-#ifdef CONFIG_CRC_MUXER
 typedef struct CRCState {
     uint32_t crcval;
 } CRCState;
@@ -53,22 +52,7 @@ static int crc_write_trailer(struct AVFormatContext *s)
     put_flush_packet(&s->pb);
     return 0;
 }
-#endif
 
-#ifdef CONFIG_FRAMECRC_MUXER
-static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
-    uint32_t crc = av_adler32_update(0, pkt->data, pkt->size);
-    char buf[256];
-
-    snprintf(buf, sizeof(buf), "%d, %"PRId64", %d, 0x%08x\n", pkt->stream_index, pkt->dts, pkt->size, crc);
-    put_buffer(&s->pb, buf, strlen(buf));
-    put_flush_packet(&s->pb);
-    return 0;
-}
-#endif
-
-#ifdef CONFIG_CRC_MUXER
 AVOutputFormat crc_muxer = {
     "crc",
     "crc testing format",
@@ -81,18 +65,3 @@ AVOutputFormat crc_muxer = {
     crc_write_packet,
     crc_write_trailer,
 };
-#endif
-#ifdef CONFIG_FRAMECRC_MUXER
-AVOutputFormat framecrc_muxer = {
-    "framecrc",
-    "framecrc testing format",
-    NULL,
-    "",
-    0,
-    CODEC_ID_PCM_S16LE,
-    CODEC_ID_RAWVIDEO,
-    NULL,
-    framecrc_write_packet,
-    NULL,
-};
-#endif
diff --git a/libavformat/crc.c b/libavformat/framecrcenc.c
similarity index 56%
copy from libavformat/crc.c
copy to libavformat/framecrcenc.c
index bdbe8bc..6b3168a 100644
--- a/libavformat/crc.c
+++ b/libavformat/framecrcenc.c
@@ -1,5 +1,5 @@
 /*
- * CRC decoder (for codec/format testing)
+ * frame CRC encoder (for codec/format testing)
  * Copyright (c) 2002 Fabrice Bellard.
  *
  * This file is part of FFmpeg.
@@ -21,41 +21,6 @@
 #include "avformat.h"
 #include "adler32.h"
 
-#ifdef CONFIG_CRC_MUXER
-typedef struct CRCState {
-    uint32_t crcval;
-} CRCState;
-
-static int crc_write_header(struct AVFormatContext *s)
-{
-    CRCState *crc = s->priv_data;
-
-    /* init CRC */
-    crc->crcval = 1;
-
-    return 0;
-}
-
-static int crc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
-    CRCState *crc = s->priv_data;
-    crc->crcval = av_adler32_update(crc->crcval, pkt->data, pkt->size);
-    return 0;
-}
-
-static int crc_write_trailer(struct AVFormatContext *s)
-{
-    CRCState *crc = s->priv_data;
-    char buf[64];
-
-    snprintf(buf, sizeof(buf), "CRC=0x%08x\n", crc->crcval);
-    put_buffer(&s->pb, buf, strlen(buf));
-    put_flush_packet(&s->pb);
-    return 0;
-}
-#endif
-
-#ifdef CONFIG_FRAMECRC_MUXER
 static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {
     uint32_t crc = av_adler32_update(0, pkt->data, pkt->size);
@@ -66,23 +31,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     put_flush_packet(&s->pb);
     return 0;
 }
-#endif
 
-#ifdef CONFIG_CRC_MUXER
-AVOutputFormat crc_muxer = {
-    "crc",
-    "crc testing format",
-    NULL,
-    "",
-    sizeof(CRCState),
-    CODEC_ID_PCM_S16LE,
-    CODEC_ID_RAWVIDEO,
-    crc_write_header,
-    crc_write_packet,
-    crc_write_trailer,
-};
-#endif
-#ifdef CONFIG_FRAMECRC_MUXER
 AVOutputFormat framecrc_muxer = {
     "framecrc",
     "framecrc testing format",
@@ -95,4 +44,3 @@ AVOutputFormat framecrc_muxer = {
     framecrc_write_packet,
     NULL,
 };
-#endif

-- 
Libav/FFmpeg packaging