virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'

Browse Source 
* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
	libavcodec/sgidec.c

See: 0f65693529
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-04-01 03:55:45 +02:00
parent 5b03caf949 ab7c64624a
commit 5628b9f5fb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/sgidec.c
View File

@@ -122,8 +122,7 @@ static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
* @param s the current image state * @param s the current image state
* @return 0 if read success, else return error code. * @return 0 if read success, else return error code.
*/ */
static int read_uncompressed_sgi(unsigned char *out_buf, static int read_uncompressed_sgi(unsigned char *out_buf, SgiState *s)
SgiState *s)
{ {
int x, y, z; int x, y, z;
unsigned int offset = s->height * s->width * s->bytes_per_channel; unsigned int offset = s->height * s->width * s->bytes_per_channel;