From ed7bd1a9a343e51a915e9a4d9c6eec072bc87031 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 22 Dec 2008 10:14:35 +0000 Subject: [PATCH] gst/mxf/: Cleanup of the includes. Original commit message from CVS: * gst/mxf/mxf.c: * gst/mxf/mxfaes-bwf.h: * gst/mxf/mxfd10.c: * gst/mxf/mxfdms1.c: * gst/mxf/mxfdms1.h: * gst/mxf/mxfmpeg.h: * gst/mxf/mxftypes.h: Cleanup of the includes. --- ChangeLog | 11 +++++++++++ gst/mxf/mxf.c | 1 - gst/mxf/mxfaes-bwf.h | 1 - gst/mxf/mxfd10.c | 18 ++++++++---------- gst/mxf/mxfdms1.c | 29 +++++++++++++++++++++++++++++ gst/mxf/mxfdms1.h | 27 +++++++++++++++++++++++++++ gst/mxf/mxfmpeg.h | 1 - gst/mxf/mxftypes.h | 2 ++ 8 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 gst/mxf/mxfdms1.c create mode 100644 gst/mxf/mxfdms1.h diff --git a/ChangeLog b/ChangeLog index 06f6eb7..3537e98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-12-22 Sebastian Dröge + + * gst/mxf/mxf.c: + * gst/mxf/mxfaes-bwf.h: + * gst/mxf/mxfd10.c: + * gst/mxf/mxfdms1.c: + * gst/mxf/mxfdms1.h: + * gst/mxf/mxfmpeg.h: + * gst/mxf/mxftypes.h: + Cleanup of the includes. + 2008-12-19 Mark Nauwelaerts * gst/qtmux/gstqtmux.c: (gst_qt_mux_change_state): diff --git a/gst/mxf/mxf.c b/gst/mxf/mxf.c index 2015bb0..655faf3 100644 --- a/gst/mxf/mxf.c +++ b/gst/mxf/mxf.c @@ -23,7 +23,6 @@ #include #include "mxfdemux.h" -#include "mxfmetadata.h" #include "mxfaes-bwf.h" #include "mxfmpeg.h" #include "mxfdv-dif.h" diff --git a/gst/mxf/mxfaes-bwf.h b/gst/mxf/mxfaes-bwf.h index 6412504..b996745 100644 --- a/gst/mxf/mxfaes-bwf.h +++ b/gst/mxf/mxfaes-bwf.h @@ -27,7 +27,6 @@ #include #include "mxfparse.h" -#include "mxfmetadata.h" void mxf_aes_bwf_init (void); diff --git a/gst/mxf/mxfd10.c b/gst/mxf/mxfd10.c index 4a63b50..bbc02ec 100644 --- a/gst/mxf/mxfd10.c +++ b/gst/mxf/mxfd10.c @@ -29,8 +29,6 @@ #include #include "mxfd10.h" -#include "mxfmpeg.h" -#include "mxfaes-bwf.h" GST_DEBUG_CATEGORY_EXTERN (mxf_debug); #define GST_CAT_DEFAULT mxf_debug @@ -175,15 +173,15 @@ mxf_d10_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags, if (!track->parent.descriptor[i]) continue; - if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent. - descriptor[i])) { - p = (MXFMetadataGenericPictureEssenceDescriptor *) track-> - parent.descriptor[i]; + if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track-> + parent.descriptor[i])) { + p = (MXFMetadataGenericPictureEssenceDescriptor *) track->parent. + descriptor[i]; break; - } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent. - descriptor[i])) { - s = (MXFMetadataGenericSoundEssenceDescriptor *) track-> - parent.descriptor[i]; + } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track-> + parent.descriptor[i])) { + s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent. + descriptor[i]; break; } } diff --git a/gst/mxf/mxfdms1.c b/gst/mxf/mxfdms1.c new file mode 100644 index 0000000..89ef14a --- /dev/null +++ b/gst/mxf/mxfdms1.c @@ -0,0 +1,29 @@ +/* GStreamer + * Copyright (C) 2008 Sebastian Dröge + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* Implementation of SMPTE S380M - Descriptive Metadata Scheme-1 */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include + +#include "mxfdms1.h" diff --git a/gst/mxf/mxfdms1.h b/gst/mxf/mxfdms1.h new file mode 100644 index 0000000..d4f1fb0 --- /dev/null +++ b/gst/mxf/mxfdms1.h @@ -0,0 +1,27 @@ +/* GStreamer + * Copyright (C) 2008 Sebastian Dröge + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* Implementation of SMPTE S380M - Descriptive Metadata Scheme-1 */ + +#ifndef __MXF_DMS1_H__ +#define __MXF_DMS1_H__ + + + +#endif /* __MXF_DMS1_H__ */ diff --git a/gst/mxf/mxfmpeg.h b/gst/mxf/mxfmpeg.h index 07e7dda..4eaddd4 100644 --- a/gst/mxf/mxfmpeg.h +++ b/gst/mxf/mxfmpeg.h @@ -27,7 +27,6 @@ #include #include "mxfparse.h" -#include "mxfmetadata.h" void mxf_mpeg_init (void); diff --git a/gst/mxf/mxftypes.h b/gst/mxf/mxftypes.h index d6f374d..ca7e29f 100644 --- a/gst/mxf/mxftypes.h +++ b/gst/mxf/mxftypes.h @@ -22,6 +22,8 @@ #ifndef __MXF_TYPES_H__ #define __MXF_TYPES_H__ +#include + /* SMPTE 377M 3.2 */ typedef struct { guint8 u[16]; -- 2.7.4