|
 |
74c516 |
--- dvgrab-3.5/filehandler.cc.orig 2013-11-06 15:45:54.000000000 -0500
|
|
|
74c516 |
+++ dvgrab-3.5/filehandler.cc 2013-11-06 15:45:57.000000000 -0500
|
|
|
74c516 |
@@ -639,6 +639,12 @@ AVIHandler::~AVIHandler()
|
|
|
74c516 |
Close();
|
|
|
74c516 |
}
|
|
|
74c516 |
|
|
|
74c516 |
+static DWORD pack_to_dword(Pack *p) {
|
|
|
74c516 |
+ DWORD ret;
|
|
|
74c516 |
+
|
|
|
74c516 |
+ ret = p->data[1] | ((DWORD)p->data[2]<<8) | ((DWORD)p->data[3]<<16) | ((DWORD)p->data[4]<<24);
|
|
|
74c516 |
+ return ret;
|
|
|
74c516 |
+}
|
|
|
74c516 |
|
|
|
74c516 |
void AVIHandler::SetSampleFrame( DVFrame *sample )
|
|
|
74c516 |
{
|
|
|
74c516 |
@@ -648,19 +654,19 @@ void AVIHandler::SetSampleFrame( DVFrame
|
|
|
74c516 |
sample->GetVideoInfo( videoInfo );
|
|
|
74c516 |
|
|
|
74c516 |
sample->GetAAUXPack( 0x50, pack );
|
|
|
74c516 |
- dvinfo.dwDVAAuxSrc = *( DWORD* ) ( pack.data + 1 );
|
|
|
74c516 |
+ dvinfo.dwDVAAuxSrc = pack_to_dword(&pack);
|
|
|
74c516 |
sample->GetAAUXPack( 0x51, pack );
|
|
|
74c516 |
- dvinfo.dwDVAAuxCtl = *( DWORD* ) ( pack.data + 1 );
|
|
|
74c516 |
+ dvinfo.dwDVAAuxCtl = pack_to_dword(&pack);
|
|
|
74c516 |
|
|
|
74c516 |
sample->GetAAUXPack( 0x52, pack );
|
|
|
74c516 |
- dvinfo.dwDVAAuxSrc1 = *( DWORD* ) ( pack.data + 1 );
|
|
|
74c516 |
+ dvinfo.dwDVAAuxSrc1 = pack_to_dword(&pack);
|
|
|
74c516 |
sample->GetAAUXPack( 0x53, pack );
|
|
|
74c516 |
- dvinfo.dwDVAAuxCtl1 = *( DWORD* ) ( pack.data + 1 );
|
|
|
74c516 |
+ dvinfo.dwDVAAuxCtl1 = pack_to_dword(&pack);
|
|
|
74c516 |
|
|
|
74c516 |
sample->GetVAUXPack( 0x60, pack );
|
|
|
74c516 |
- dvinfo.dwDVVAuxSrc = *( DWORD* ) ( pack.data + 1 );
|
|
|
74c516 |
+ dvinfo.dwDVVAuxSrc = pack_to_dword(&pack);
|
|
|
74c516 |
sample->GetVAUXPack( 0x61, pack );
|
|
|
74c516 |
- dvinfo.dwDVVAuxCtl = *( DWORD* ) ( pack.data + 1 );
|
|
|
74c516 |
+ dvinfo.dwDVVAuxCtl = pack_to_dword(&pack);
|
|
|
74c516 |
|
|
|
74c516 |
#ifdef WITH_LIBDV
|
|
|
74c516 |
|