dvb/si: Change define guards to match where the files are.

dvb/si/desc_4c.h

@@ -30,8 +30,8 @@
  *  - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
  */
 
-#ifndef __BITSTREAM_MPEG_DESC_4C_H__
-#define __BITSTREAM_MPEG_DESC_4C_H__
+#ifndef __BITSTREAM_DVB_DESC_4C_H__
+#define __BITSTREAM_DVB_DESC_4C_H__
 
 #include <bitstream/common.h>
 #include <bitstream/mpeg/psi/descriptors.h>

dvb/si/desc_4f.h

@@ -30,8 +30,8 @@
  *  - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
  */
 
-#ifndef __BITSTREAM_MPEG_DESC_4F_H__
-#define __BITSTREAM_MPEG_DESC_4F_H__
+#ifndef __BITSTREAM_DVB_DESC_4F_H__
+#define __BITSTREAM_DVB_DESC_4F_H__
 
 #include <bitstream/common.h>
 #include <bitstream/mpeg/psi/descriptors.h>

dvb/si/desc_60.h

@@ -30,8 +30,8 @@
  *  - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
  */
 
-#ifndef __BITSTREAM_MPEG_DESC_60_H__
-#define __BITSTREAM_MPEG_DESC_60_H__
+#ifndef __BITSTREAM_DVB_DESC_60_H__
+#define __BITSTREAM_DVB_DESC_60_H__
 
 #include <bitstream/common.h>
 #include <bitstream/mpeg/psi/descriptors.h>

dvb/si/sit.h

@@ -28,11 +28,11 @@
 
 /*
  * Normative references:
- *  - ISO/IEC 13818-1:2007(E) (MPEG-2 Systems)
+ *  - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
  */
 
-#ifndef __BITSTREAM_MPEG_SIT_H__
-#define __BITSTREAM_MPEG_SIT_H__
+#ifndef __BITSTREAM_DVB_SIT_H__
+#define __BITSTREAM_DVB_SIT_H__
 
 #include <bitstream/common.h>
 #include <bitstream/mpeg/psi/psi.h>

dvb/si/sit_print.h

@@ -26,8 +26,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
 
-#ifndef __BITSTREAM_MPEG_SIT_PRINT_H__
-#define __BITSTREAM_MPEG_SIT_PRINT_H__
+#ifndef __BITSTREAM_DVB_SIT_PRINT_H__
+#define __BITSTREAM_DVB_SIT_PRINT_H__
 
 #include <bitstream/common.h>
 #include <bitstream/mpeg/psi/psi.h>