Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 367107
b: refs/heads/master
c: 5600601
h: refs/heads/master
i:
  367105: d11c720
  367103: ca901e4
v: v3
  • Loading branch information
Kamil Debski authored and Mauro Carvalho Chehab committed Apr 25, 2013
1 parent e68b83f commit 47a242e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aca326aeab43219ba8120a0a2976baa359b9a38d
refs/heads/master: 56006017316cea85cedd22a5f2f7aa31e77a40df
10 changes: 4 additions & 6 deletions trunk/drivers/media/platform/s5p-mfc/s5p_mfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,10 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) {
memcpy(&dst_buf->b->v4l2_buf.timecode,
&src_buf->b->v4l2_buf.timecode,
sizeof(struct v4l2_timecode));
memcpy(&dst_buf->b->v4l2_buf.timestamp,
&src_buf->b->v4l2_buf.timestamp,
sizeof(struct timeval));
dst_buf->b->v4l2_buf.timecode =
src_buf->b->v4l2_buf.timecode;
dst_buf->b->v4l2_buf.timestamp =
src_buf->b->v4l2_buf.timestamp;
switch (frame_type) {
case S5P_FIMV_DECODE_FRAME_I_FRAME:
dst_buf->b->v4l2_buf.flags |=
Expand Down

0 comments on commit 47a242e

Please sign in to comment.