Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

libxavs: rename and fix a variable name

Browse Source 
It was mis-spelled in b18c7c8d3d.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
pull/47/merge
Sean McGovern 11 years ago committed by Anton Khirnov
parent 03f6d4e0f1
commit a7b87ca911
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      libavcodec/libxavs.c

16
libavcodec/libxavs.c
Unescape View File

@ -112,10 +112,10 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt,
return 1; return 1;
} }
static int XAVS_frame(AVCodecContext *ctx, AVPacket *pkt, static int XAVS_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet) const AVFrame *frame, int *got_packet)
{ {
XavsContext *x4 = ctx->priv_data; XavsContext *x4 = avctx->priv_data;
xavs_nal_t *nal; xavs_nal_t *nal;
int nnal, i, ret; int nnal, i, ret;
xavs_picture_t pic_out; xavs_picture_t pic_out;
@ -131,14 +131,14 @@ static int XAVS_frame(AVCodecContext *ctx, AVPacket *pkt,
x4->pic.i_pts = frame->pts; x4->pic.i_pts = frame->pts;
x4->pic.i_type = XAVS_TYPE_AUTO; x4->pic.i_type = XAVS_TYPE_AUTO;
x4->pts_buffer[ctx->frame_number % (ctx->max_b_frames+1)] = frame->pts; x4->pts_buffer[avctx->frame_number % (avctx->max_b_frames+1)] = frame->pts;
} }
if (xavs_encoder_encode(x4->enc, &nal, &nnal, if (xavs_encoder_encode(x4->enc, &nal, &nnal,
frame? &x4->pic: NULL, &pic_out) < 0) frame? &x4->pic: NULL, &pic_out) < 0)
return -1; return -1;
ret = encode_nals(ctx, pkt, nal, nnal); ret = encode_nals(avctx, pkt, nal, nnal);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -152,8 +152,8 @@ static int XAVS_frame(AVCodecContext *ctx, AVPacket *pkt,
pkt->data[1] = 0x0; pkt->data[1] = 0x0;
pkt->data[2] = 0x01; pkt->data[2] = 0x01;
pkt->data[3] = 0xb1; pkt->data[3] = 0xb1;
pkt->dts = 2*x4->pts_buffer[(x4->out_frame_count-1)%(ctx->max_b_frames+1)] - pkt->dts = 2*x4->pts_buffer[(x4->out_frame_count-1)%(avctx->max_b_frames+1)] -
x4->pts_buffer[(x4->out_frame_count-2)%(ctx->max_b_frames+1)]; x4->pts_buffer[(x4->out_frame_count-2)%(avctx->max_b_frames+1)];
x4->end_of_stream = END_OF_STREAM; x4->end_of_stream = END_OF_STREAM;
*got_packet = 1; *got_packet = 1;
} }
@ -162,11 +162,11 @@ static int XAVS_frame(AVCodecContext *ctx, AVPacket *pkt,
avctx->coded_frame->pts = pic_out.i_pts; avctx->coded_frame->pts = pic_out.i_pts;
pkt->pts = pic_out.i_pts; pkt->pts = pic_out.i_pts;
if (ctx->has_b_frames) { if (avctx->has_b_frames) {
if (!x4->out_frame_count) if (!x4->out_frame_count)
pkt->dts = pkt->pts - (x4->pts_buffer[1] - x4->pts_buffer[0]); pkt->dts = pkt->pts - (x4->pts_buffer[1] - x4->pts_buffer[0]);
else else
pkt->dts = x4->pts_buffer[(x4->out_frame_count-1)%(ctx->max_b_frames+1)]; pkt->dts = x4->pts_buffer[(x4->out_frame_count-1)%(avctx->max_b_frames+1)];
} else } else
pkt->dts = pkt->pts; pkt->dts = pkt->pts;

Write Preview
Loading…
Cancel
Save