mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Sebastian Dröge 2011-05-27 13:58:41 +02:00
commit 125f6a2fdf
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/pbutils/codec-utils.c
View file

@ -707,7 +707,7 @@ gst_codec_utils_mpeg4video_get_level (const guint8 * vis_obj_seq, guint len)
break; break;
case 0xf: case 0xf:
if (level_id == 7 && level_id > 0xd) if (level_id == 6 || level_id == 7 || level_id > 0xd)
return NULL; return NULL;
break; break;
} }
@ -718,6 +718,9 @@ gst_codec_utils_mpeg4video_get_level (const guint8 * vis_obj_seq, guint len)
else if (profile_id == 0 && level_id == 9) else if (profile_id == 0 && level_id == 9)
/* Simple Profile / Level 0b */ /* Simple Profile / Level 0b */
return "0b"; return "0b";
else if (profile_id == 0xf && level_id > 7)
/* Fine Granularity Scalable Profile */
return digit_to_string (level_id - 8);
else if (level_id <= level_max[profile_id]) else if (level_id <= level_max[profile_id])
/* Levels for all other cases */ /* Levels for all other cases */
return digit_to_string (level_id); return digit_to_string (level_id);