virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Remove a NAL unit's trailing zero bytes even when dst_length is 1.

Browse Source 
Consider the following byte sequence

    00 00 01 0a 00 00 00 01 09 ...
               ^  ^
               A  B

decode_nal() determines dst_length to be 1 (i. e. the byte between label
A and B above). However, this byte is a trailing zero byte as the spec
says the the current NAL unit is terminated by a byte sequence 00 00 00.

The current code used a loop to decrement dst_length accordingly. But the
loop doesn't start as the loop condition checks for dst_length > 1, which
should read dst_length > 0.
patch by Reinhard Nissl, rnissl gmx de

Originally committed as revision 8689 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reinhard Nissl 2007-04-09 13:39:35 +00:00 committed by Diego Biurrun
parent ff82e429cb
commit 6ac9696e77
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -8147,7 +8147,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
if (ptr==NULL || dst_length < 0){ if (ptr==NULL || dst_length < 0){
return -1; return -1;
} }
while(ptr[dst_length - 1] == 0 && dst_length > 1) while(ptr[dst_length - 1] == 0 && dst_length > 0)
dst_length--; dst_length--;
bit_length= 8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 1); bit_length= 8*dst_length - decode_rbsp_trailing(h, ptr + dst_length - 1);