Browse Source

rm: Use the correct codec_data_size signedness

The function takes a size and not an offset.

CC: libav-stable@libav.org
Sample-Id: rm_deadlock.rm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
tags/n2.6
Luca Barbato Vittorio Giovara 11 years ago
parent
commit
1c77ead1fb
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      libavformat/rdt.c
  2. +1
    -1
      libavformat/rm.h
  3. +3
    -3
      libavformat/rmdec.c

+ 1
- 1
libavformat/rdt.c View File

@@ -132,7 +132,7 @@ static int
rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr) rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr)
{ {
AVIOContext pb; AVIOContext pb;
int size;
unsigned int size;
uint32_t tag; uint32_t tag;


/** /**


+ 1
- 1
libavformat/rm.h View File

@@ -50,7 +50,7 @@ extern AVInputFormat ff_rdt_demuxer;
*/ */
int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb, int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
AVStream *st, RMStream *rst, AVStream *st, RMStream *rst,
int codec_data_size);
unsigned int codec_data_size);


/** /**
* Parse one rm-stream packet from the input bytestream. * Parse one rm-stream packet from the input bytestream.


+ 3
- 3
libavformat/rmdec.c View File

@@ -282,9 +282,9 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb,
return 0; return 0;
} }


int
ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
AVStream *st, RMStream *rst, int codec_data_size)
int ff_rm_read_mdpr_codecdata(AVFormatContext *s, AVIOContext *pb,
AVStream *st, RMStream *rst,
unsigned int codec_data_size)
{ {
unsigned int v; unsigned int v;
int size; int size;


Loading…
Cancel
Save