[vlc-commits] h264: refactor emulation prevention byte handling

[Felix Abecassis]

vlc | branch: master | Felix Abecassis <felix.abecassis at gmail.com> | Fri Aug  1 11:18:40 2014 +0200| [0643589050694bdc42c5709ef2b3d5dbc62748d7] | committer: Felix Abecassis

h264: refactor emulation prevention byte handling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0643589050694bdc42c5709ef2b3d5dbc62748d7
---

 modules/packetizer/h264.c |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 202ae6b..2b84a27 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -555,22 +555,7 @@ static void CreateDecodedNAL( uint8_t **pp_ret, int *pi_ret,
     *pp_ret = dst;
 
     if( dst )
-    {
-        while( src < end )
-        {
-            if( src < end - 3 && src[0] == 0x00 && src[1] == 0x00 &&
-                src[2] == 0x03 )
-            {
-                *dst++ = 0x00;
-                *dst++ = 0x00;
-
-                src += 3;
-                continue;
-            }
-            *dst++ = *src++;
-        }
-    }
-    *pi_ret = dst - *pp_ret;
+        *pi_ret = nal_decode(src, dst, i_src);
 }
 
 /*****************************************************************************