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

matroskadec: extract read_level_up out of ebml_read_element_id

Browse Source 
Originally committed as revision 14585 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:41:40 +00:00
parent dfde36a33e
commit 44cea7651b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/matroskadec.c
View File

@ -559,10 +559,6 @@ ebml_read_element_id (MatroskaDemuxContext *matroska,
return read;
*id = matroska->peek_id = total | (1 << (read * 7));
/* level tracking */
if (level_up)
*level_up = ebml_read_element_level_up(matroska);
return read;
}
@ -591,10 +587,15 @@ ebml_peek_id (MatroskaDemuxContext *matroska,
int *level_up)
{
uint32_t id;
int res;
if (ebml_read_element_id(matroska, &id, level_up) < 0)
res = ebml_read_element_id(matroska, &id, NULL);
if (res < 0)
return 0;
if (res > 0 && level_up)
*level_up = ebml_read_element_level_up(matroska);
return id;
}