Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181601
b: refs/heads/master
c: db1b726
h: refs/heads/master
i:
  181599: ac6cf28
v: v3
  • Loading branch information
Márton Németh authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 01b5de5 commit edde9ab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 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: 26ee91efd941ea7fd40f6ee004f2f4d72f334564
refs/heads/master: db1b72650d22b8ac3ce56aa90c4fe1314f1876cb
3 changes: 2 additions & 1 deletion trunk/drivers/media/video/zoran/zoran_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,8 @@ zoran_reap_stat_com (struct zoran *zr)
static void zoran_restart(struct zoran *zr)
{
/* Now the stat_comm buffer is ready for restart */
int status = 0, mode;
unsigned int status = 0;
int mode;

if (zr->codec_mode == BUZ_MODE_MOTION_COMPRESS) {
decoder_call(zr, video, g_input_status, &status);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/video/zoran/zoran_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1444,7 +1444,7 @@ zoran_set_norm (struct zoran *zr,
}

if (norm == V4L2_STD_ALL) {
int status = 0;
unsigned int status = 0;
v4l2_std_id std = 0;

decoder_call(zr, video, querystd, &std);
Expand Down

0 comments on commit edde9ab

Please sign in to comment.