diff --git a/include/h323/h323ep.h b/include/h323/h323ep.h
--- a/include/h323/h323ep.h
+++ b/include/h323/h323ep.h
@@ -60,6 +60,7 @@ class H225_H221NonStandard;
 class H225_H221NonStandard;
 class H225_ServiceControlDescriptor;
 class H225_FeatureSet;
+class H225_ArrayOf_SupportedProtocols;
 
 class H235SecurityInfo;
 
diff --git a/plugins/video/H.264/shared/h264frame.cxx b/plugins/video/H.264/shared/h264frame.cxx
--- a/plugins/video/H.264/shared/h264frame.cxx
+++ b/plugins/video/H.264/shared/h264frame.cxx
@@ -86,7 +86,6 @@ H264Frame::~H264Frame ()
 
 #ifndef LICENCE_MPL
 void H264Frame::SetFromFrame (x264_nal_t *NALs, int numberOfNALs) {
-  int vopBufferLen;
   int currentNAL = 0;
 
   uint8_t* currentPositionInFrame=(uint8_t*) _encodedFrame;
@@ -99,8 +98,9 @@ void H264Frame::SetFromFrame (x264_nal_t
 
   // read the nals out of the encoder and create meta data about their location and size in the frame
   for (currentNAL = 0; currentNAL < numberOfNALs; currentNAL++) {
-    int currentNALLen;
-    currentNALLen = X264_NAL_ENCODE(currentPositionInFrame, &vopBufferLen, 1, &NALs[currentNAL]);
+    int currentNALLen = NALs[currentNAL].i_payload;
+    memcpy(currentPositionInFrame, NALs[currentNAL].p_payload, NALs[currentNAL].i_payload);
+
     if (currentNALLen > 0) 
     {
       _NALs[_numberOfNALsInFrame].length = currentNALLen;