[libbluray-devel] commit: Cosmetics (hpi1 )
git at videolan.org
git at videolan.org
Thu Aug 19 14:04:27 CEST 2010
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Wed Aug 18 14:43:01 2010 +0300| [c059415f01ff239392d0e7a96a1a70d0b96f8fbd] | committer: hpi1
Cosmetics
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=c059415f01ff239392d0e7a96a1a70d0b96f8fbd
---
src/libbluray/decoders/ig_decode.c | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/libbluray/decoders/ig_decode.c b/src/libbluray/decoders/ig_decode.c
index df0badb..d282477 100644
--- a/src/libbluray/decoders/ig_decode.c
+++ b/src/libbluray/decoders/ig_decode.c
@@ -261,22 +261,26 @@ static void _clean_interactive_composition(BD_IG_INTERACTIVE_COMPOSITION *p)
int ig_decode_interactive(BITBUFFER *bb, BD_IG_INTERACTIVE *p)
{
- BD_PG_SEQUENCE_DESCRIPTOR sd;
-
- pg_decode_video_descriptor(bb, &p->video_descriptor);
- pg_decode_composition_descriptor(bb, &p->composition_descriptor);
- pg_decode_sequence_descriptor(bb, &sd);
-
- if (!sd.first_in_seq) {
- ERROR("not first in seq\n");
- return 0;
- }
- if (!sd.last_in_seq) {
- ERROR("not last in seq\n");
- return 0;
- }
-
- return _decode_interactive_composition(bb, &p->interactive_composition);
+ BD_PG_SEQUENCE_DESCRIPTOR sd;
+
+ pg_decode_video_descriptor(bb, &p->video_descriptor);
+ pg_decode_composition_descriptor(bb, &p->composition_descriptor);
+ pg_decode_sequence_descriptor(bb, &sd);
+
+ if (!sd.first_in_seq) {
+ ERROR("ig_decode_interactive(): not first in seq\n");
+ return 0;
+ }
+ if (!sd.last_in_seq) {
+ ERROR("ig_decode_interactive(): not last in seq\n");
+ return 0;
+ }
+ if (!bb_is_align(bb, 0x07)) {
+ ERROR("ig_decode_interactive(): alignment error\n");
+ return 0;
+ }
+
+ return _decode_interactive_composition(bb, &p->interactive_composition);
}
void ig_clean_interactive(BD_IG_INTERACTIVE *p)
More information about the libbluray-devel
mailing list