mirror of https://git.ffmpeg.org/ffmpeg.git
const
Originally committed as revision 11741 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
92ddaf2622
commit
16db358520
|
@ -597,7 +597,7 @@ static int rv10_decode_end(AVCodecContext *avctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rv10_decode_packet(AVCodecContext *avctx,
|
static int rv10_decode_packet(AVCodecContext *avctx,
|
||||||
uint8_t *buf, int buf_size)
|
const uint8_t *buf, int buf_size)
|
||||||
{
|
{
|
||||||
MpegEncContext *s = avctx->priv_data;
|
MpegEncContext *s = avctx->priv_data;
|
||||||
int mb_count, mb_pos, left, start_mb_x;
|
int mb_count, mb_pos, left, start_mb_x;
|
||||||
|
@ -711,7 +711,7 @@ static int rv10_decode_packet(AVCodecContext *avctx,
|
||||||
return buf_size;
|
return buf_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int get_slice_offset(AVCodecContext *avctx, uint8_t *buf, int n)
|
static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n)
|
||||||
{
|
{
|
||||||
if(avctx->slice_count) return avctx->slice_offset[n];
|
if(avctx->slice_count) return avctx->slice_offset[n];
|
||||||
else return AV_RL32(buf + n*8);
|
else return AV_RL32(buf + n*8);
|
||||||
|
@ -719,13 +719,13 @@ static int get_slice_offset(AVCodecContext *avctx, uint8_t *buf, int n)
|
||||||
|
|
||||||
static int rv10_decode_frame(AVCodecContext *avctx,
|
static int rv10_decode_frame(AVCodecContext *avctx,
|
||||||
void *data, int *data_size,
|
void *data, int *data_size,
|
||||||
uint8_t *buf, int buf_size)
|
const uint8_t *buf, int buf_size)
|
||||||
{
|
{
|
||||||
MpegEncContext *s = avctx->priv_data;
|
MpegEncContext *s = avctx->priv_data;
|
||||||
int i;
|
int i;
|
||||||
AVFrame *pict = data;
|
AVFrame *pict = data;
|
||||||
int slice_count;
|
int slice_count;
|
||||||
uint8_t *slices_hdr = NULL;
|
const uint8_t *slices_hdr = NULL;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
|
av_log(avctx, AV_LOG_DEBUG, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
|
||||||
|
|
Loading…
Reference in New Issue