libeplayer3: fix merge errors

This commit is contained in:
Stefan Seyfried
2013-11-09 22:45:13 +01:00
parent 068769c110
commit a2a4651c46
2 changed files with 2 additions and 6 deletions

View File

@@ -90,8 +90,6 @@ int InsertPesHeader (unsigned char *data, int size, unsigned char stream_id, uns
{
BitPacker_t ld2 = {data, 0, 32};
#if 0
/* does not seem to hurt, at least with h264 data...? */
if (size > MAX_PES_PACKET_SIZE)
size = 0; // unbounded