mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
get_bits: move check_marker() to mpegvideodec.h
It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263, ituh263, mpeg4video.
This commit is contained in:
parent
8cfb44cd2e
commit
c9a2506de9
@ -31,7 +31,6 @@
|
||||
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/avassert.h"
|
||||
|
||||
#include "defs.h"
|
||||
@ -610,16 +609,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n)
|
||||
}
|
||||
}
|
||||
|
||||
static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
|
||||
{
|
||||
int bit = get_bits1(s);
|
||||
if (!bit)
|
||||
av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
|
||||
get_bits_count(s) - 1, s->size_in_bits, msg);
|
||||
|
||||
return bit;
|
||||
}
|
||||
|
||||
static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer,
|
||||
int bit_size, int is_le)
|
||||
{
|
||||
|
@ -21,6 +21,7 @@
|
||||
#include "codec_internal.h"
|
||||
#include "mpegutils.h"
|
||||
#include "mpegvideo.h"
|
||||
#include "mpegvideodec.h"
|
||||
#include "h263data.h"
|
||||
#include "h263dec.h"
|
||||
#include "mpegvideodata.h"
|
||||
|
@ -48,6 +48,7 @@
|
||||
#include "rv10dec.h"
|
||||
#include "mpeg4video.h"
|
||||
#include "mpegvideodata.h"
|
||||
#include "mpegvideodec.h"
|
||||
#include "mpeg4videodec.h"
|
||||
|
||||
// The defines below define the number of bits that are read at once for
|
||||
|
@ -29,6 +29,8 @@
|
||||
#define AVCODEC_MPEGVIDEODEC_H
|
||||
|
||||
#include "libavutil/frame.h"
|
||||
#include "libavutil/log.h"
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "mpegpicture.h"
|
||||
@ -67,4 +69,14 @@ static inline int mpeg_get_qscale(MpegEncContext *s)
|
||||
return qscale << 1;
|
||||
}
|
||||
|
||||
static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
|
||||
{
|
||||
int bit = get_bits1(s);
|
||||
if (!bit)
|
||||
av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
|
||||
get_bits_count(s) - 1, s->size_in_bits, msg);
|
||||
|
||||
return bit;
|
||||
}
|
||||
|
||||
#endif /* AVCODEC_MPEGVIDEODEC_H */
|
||||
|
Loading…
Reference in New Issue
Block a user