Browse Source

Move check_marker() from get_bits to mpeg4videodec

MPEG-4 is the only decoder which uses check_marker().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n3.1
Alexandra Hájková Anton Khirnov 9 years ago
parent
commit
e4b38878da
2 changed files with 9 additions and 9 deletions
  1. +0
    -9
      libavcodec/get_bits.h
  2. +9
    -0
      libavcodec/mpeg4videodec.c

+ 0
- 9
libavcodec/get_bits.h View File

@@ -364,15 +364,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n)
}
}

static inline int check_marker(GetBitContext *s, const char *msg)
{
int bit = get_bits1(s);
if (!bit)
av_log(NULL, AV_LOG_INFO, "Marker bit missing %s\n", msg);

return bit;
}

/**
* Initialize GetBitContext.
* @param buffer bitstream buffer, must be AV_INPUT_BUFFER_PADDING_SIZE bytes


+ 9
- 0
libavcodec/mpeg4videodec.c View File

@@ -51,6 +51,15 @@ static const int mb_type_b_map[4] = {
MB_TYPE_L0 | MB_TYPE_16x16,
};

static inline int check_marker(GetBitContext *s, const char *msg)
{
int bit = get_bits1(s);
if (!bit)
av_log(NULL, AV_LOG_INFO, "Marker bit missing %s\n", msg);

return bit;
}

/**
* Predict the ac.
* @param n block index (0-3 are luma, 4-5 are chroma)


Loading…
Cancel
Save