virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'

Browse Source 
* commit '93f305473f880729d18b5e42067f19d2106cb2e5':
  lavc: Convert some remaining strides to ptrdiff_t

Conflicts:
	libavcodec/h264.h
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/vp56.c
	libavcodec/wmv2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-16 13:08:37 +02:00
commit 10c6d1b28c
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.h
View File

@ -379,7 +379,7 @@ typedef struct H264Context {
uint32_t *mb2br_xy; uint32_t *mb2br_xy;
int b_stride; // FIXME use s->b4_stride int b_stride; // FIXME use s->b4_stride
ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff
ptrdiff_t mb_uvlinesize; ptrdiff_t mb_uvlinesize;
unsigned current_sps_id; ///< id of the current SPS unsigned current_sps_id; ///< id of the current SPS

4
libavcodec/mpegvideo_enc.c
View File

@ -984,8 +984,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
if (pic_arg->linesize[2] != s->uvlinesize) if (pic_arg->linesize[2] != s->uvlinesize)
direct = 0; direct = 0;
av_dlog(s->avctx, "%d %d %d %d\n", pic_arg->linesize[0], av_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0],
pic_arg->linesize[1], (int) s->linesize, (int) s->uvlinesize); pic_arg->linesize[1], s->linesize, s->uvlinesize);
if (direct) { if (direct) {
i = ff_find_unused_picture(s, 1); i = ff_find_unused_picture(s, 1);

7
libavcodec/mpegvideo_motion.c
View File

@ -38,9 +38,8 @@ static void gmc1_motion(MpegEncContext *s,
uint8_t **ref_picture) uint8_t **ref_picture)
{ {
uint8_t *ptr; uint8_t *ptr;
int src_x, src_y; int src_x, src_y, motion_x, motion_y;
ptrdiff_t offset, linesize, uvlinesize; ptrdiff_t offset, linesize, uvlinesize;
int motion_x, motion_y;
int emu=0; int emu=0;
motion_x= s->sprite_offset[0][0]; motion_x= s->sprite_offset[0][0];
@ -564,9 +563,9 @@ static void chroma_4mv_motion(MpegEncContext *s,
op_pixels_func *pix_op, op_pixels_func *pix_op,
int mx, int my) int mx, int my)
{ {
int dxy, emu=0, src_x, src_y;
ptrdiff_t offset;
uint8_t *ptr; uint8_t *ptr;
int src_x, src_y, dxy, emu = 0;
ptrdiff_t offset;
/* In case of 8X8, we construct a single chroma motion vector /* In case of 8X8, we construct a single chroma motion vector
with a special rounding */ with a special rounding */

2
libavcodec/vp3.c
View File

@ -1294,7 +1294,7 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int ye
int width = s->fragment_width[!!plane]; int width = s->fragment_width[!!plane];
int height = s->fragment_height[!!plane]; int height = s->fragment_height[!!plane];
int fragment = s->fragment_start [plane] + ystart * width; int fragment = s->fragment_start [plane] + ystart * width;
int stride = s->current_frame.f->linesize[plane]; ptrdiff_t stride = s->current_frame.f->linesize[plane];
uint8_t *plane_data = s->current_frame.f->data [plane]; uint8_t *plane_data = s->current_frame.f->data [plane];
if (!s->flipped_image) stride = -stride; if (!s->flipped_image) stride = -stride;
plane_data += s->data_offset[plane] + 8*ystart*stride; plane_data += s->data_offset[plane] + 8*ystart*stride;

5
libavcodec/vp56.c
View File

@ -303,7 +303,7 @@ static void vp56_add_predictors_dc(VP56Context *s, VP56Frame ref_frame)
} }
static void vp56_deblock_filter(VP56Context *s, uint8_t *yuv, static void vp56_deblock_filter(VP56Context *s, uint8_t *yuv,
int stride, int dx, int dy) ptrdiff_t stride, int dx, int dy)
{ {
int t = ff_vp56_filter_threshold[s->quantizer]; int t = ff_vp56_filter_threshold[s->quantizer];
if (dx) s->vp56dsp.edge_filter_hor(yuv + 10-dx , stride, t); if (dx) s->vp56dsp.edge_filter_hor(yuv + 10-dx , stride, t);
@ -584,7 +584,8 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data,
VP56Context *s = is_alpha ? s0->alpha_context : s0; VP56Context *s = is_alpha ? s0->alpha_context : s0;
AVFrame *const p = s->frames[VP56_FRAME_CURRENT]; AVFrame *const p = s->frames[VP56_FRAME_CURRENT];
int mb_row, mb_col, mb_row_flip, mb_offset = 0; int mb_row, mb_col, mb_row_flip, mb_offset = 0;
int block, y, uv, stride_y, stride_uv; int block, y, uv;
ptrdiff_t stride_y, stride_uv;
int res; int res;
if (p->key_frame) { if (p->key_frame) {