[FFmpeg-cvslog] mpeg4videodec: simplify mpeg4_decode_profile_level()

Michael Niedermayer git at videolan.org
Sun Jul 24 16:29:38 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 24 16:21:37 2011 +0200| [52e24c7d7e3a449aa1e4043e77f082150d733e7a] | committer: Michael Niedermayer

mpeg4videodec: simplify mpeg4_decode_profile_level()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52e24c7d7e3a449aa1e4043e77f082150d733e7a
---

 libavcodec/mpeg4videodec.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index b983a44..b44f2f0 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1528,12 +1528,9 @@ static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){
 }
 
 static int mpeg4_decode_profile_level(MpegEncContext * s, GetBitContext *gb){
-  int profile_and_level_indication;
 
-  profile_and_level_indication = get_bits(gb, 8);
-
-  s->avctx->profile = (profile_and_level_indication & 0xf0) >> 4;
-  s->avctx->level   = (profile_and_level_indication & 0x0f);
+  s->avctx->profile = get_bits(gb, 4);
+  s->avctx->level   = get_bits(gb, 4);
 
   // for Simple profile, level 0
   if (s->avctx->profile == 0 && s->avctx->level == 8) {



More information about the ffmpeg-cvslog mailing list