diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-24 16:21:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-24 16:21:37 +0200 |
| commit | 52e24c7d7e3a449aa1e4043e77f082150d733e7a (patch) | |
| tree | 77b1674fc537849134eae516b5e088a9388a61ec /libavcodec/mpeg4videodec.c | |
| parent | 9c2651ab44fac3fcacd576852a7570ac64f3686e (diff) | |
| download | ffmpeg-52e24c7d7e3a449aa1e4043e77f082150d733e7a.tar.gz | |
mpeg4videodec: simplify mpeg4_decode_profile_level()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index b983a44855..b44f2f0803 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) { |