diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 00:41:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 00:48:47 +0100 |
| commit | ef2f9073dda3a1ce73f44d444bc27fae5707f396 (patch) | |
| tree | 3420974b6a250d77814242fa2cc53ce579fc08c3 /libavformat/rm.h | |
| parent | a0d0799ea2a79c6b598541248fe24083265cf336 (diff) | |
| parent | 1c77ead1fb14d64e6798fc5e32af04abcb3cebb4 (diff) | |
| download | ffmpeg-ef2f9073dda3a1ce73f44d444bc27fae5707f396.tar.gz | |
Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'
* commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4':
rm: Use the correct codec_data_size signedness
Conflicts:
libavformat/rm.h
libavformat/rmdec.c
See: a6f730730b82645a9d31aad0968487cb77d6946c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rm.h')
| -rw-r--r-- | libavformat/rm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rm.h b/libavformat/rm.h index a72e8b7997..7b080e2a36 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -50,7 +50,7 @@ extern AVInputFormat ff_rdt_demuxer; */ int ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb, AVStream *st, RMStream *rst, - int codec_data_size, const uint8_t *mime); + unsigned int codec_data_size, const uint8_t *mime); /** * Parse one rm-stream packet from the input bytestream. |