From c7bd07d660820275ddc6da90c3d4e0fd80d85c07 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <s.p.the.ghost@gmail.com>
Date: Sat, 22 Jan 2011 11:51:00 +0100
Subject: [PATCH] avcC box namespace fixed

---
 MP4/box_avcC.cpp | 26 +++++++++++++-------------
 MP4/box_avcC.h   |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/MP4/box_avcC.cpp b/MP4/box_avcC.cpp
index ba25b338..293bf168 100644
--- a/MP4/box_avcC.cpp
+++ b/MP4/box_avcC.cpp
@@ -1,49 +1,49 @@
-#include "box_h264.h"
+#include "box_avcC.h"
 
-Box_h264::Box_h264( ) {
-  Container = new Box( 0x68323634 );
+Box_avcC::Box_avcC( ) {
+  Container = new Box( 0x61766343 );
   SetReserved();
   SetDefaults();
 }
 
-Box_h264::~Box_h264() {
+Box_avcC::~Box_avcC() {
   delete Container;
 }
 
-Box * Box_h264::GetBox() {
+Box * Box_avcC::GetBox() {
   return Container;
 }
 
-void Box_h264::SetDataReferenceIndex( uint16_t DataReferenceIndex ) {
+void Box_avcC::SetDataReferenceIndex( uint16_t DataReferenceIndex ) {
   Container->SetPayload((uint32_t)2,Box::uint16_to_uint8( DataReferenceIndex ),6);
 }
 
-void Box_h264::SetDimensions ( uint16_t Width, uint16_t Height ) {
+void Box_avcC::SetDimensions ( uint16_t Width, uint16_t Height ) {
   Container->SetPayload((uint32_t)2,Box::uint16_to_uint8( Height ),26);
   Container->SetPayload((uint32_t)2,Box::uint16_to_uint8( Width ),24);
 }
 
-void Box_h264::SetResolution ( uint32_t Horizontal, uint32_t Vertical ) {
+void Box_avcC::SetResolution ( uint32_t Horizontal, uint32_t Vertical ) {
   Container->SetPayload((uint32_t)4,Box::uint32_to_uint8( Vertical ),32);
   Container->SetPayload((uint32_t)4,Box::uint32_to_uint8( Horizontal ),28);
 }
 
-void Box_h264::SetFrameCount ( uint16_t FrameCount ) {
+void Box_avcC::SetFrameCount ( uint16_t FrameCount ) {
   Container->SetPayload((uint32_t)2,Box::uint16_to_uint8( FrameCount ),40);
 }
 
-void Box_h264::SetCompressorName ( std::string CompressorName ) {
+void Box_avcC::SetCompressorName ( std::string CompressorName ) {
   uint8_t * Printable = new uint8_t[1];
   Printable[0] = std::min( (unsigned int)31, CompressorName.size() );
   Container->SetPayload((uint32_t)Printable[0],(uint8_t*)CompressorName.c_str(),43);
   Container->SetPayload((uint32_t)1, Printable ,42);
 }
 
-void Box_h264::SetDepth ( uint16_t Depth ) {
+void Box_avcC::SetDepth ( uint16_t Depth ) {
   Container->SetPayload((uint32_t)2,Box::uint16_to_uint8( Depth ),74);
 }
 
-void Box_h264::SetReserved( ) {
+void Box_avcC::SetReserved( ) {
   Container->SetPayload((uint32_t)2,Box::uint16_to_uint8( (uint16_t)-1 ),76);
   Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(0),36);
   Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(0),20);
@@ -54,7 +54,7 @@ void Box_h264::SetReserved( ) {
   Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(0));
 }
 
-void Box_h264::SetDefaults( ) {
+void Box_avcC::SetDefaults( ) {
   SetResolution ( );
   SetFrameCount ( );
   SetDepth ( );
diff --git a/MP4/box_avcC.h b/MP4/box_avcC.h
index f0f4920f..fc7dd27e 100644
--- a/MP4/box_avcC.h
+++ b/MP4/box_avcC.h
@@ -1,10 +1,10 @@
 #include "box.h"
 #include <string>
 
-class Box_h264 {
+class Box_avcC {
   public:
-    Box_h264( );
-    ~Box_h264();
+    Box_avcC( );
+    ~Box_avcC();
     Box * GetBox();
     void SetReserved( );
     void SetDataReferenceIndex( uint16_t DataReferenceIndex );