diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 02:41:00 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 02:48:47 +0300 |
| commit | ef2f9073dda3a1ce73f44d444bc27fae5707f396 (patch) | |
| tree | 3420974b6a250d77814242fa2cc53ce579fc08c3 /libavformat/rdt.c | |
| parent | a0d0799ea2a79c6b598541248fe24083265cf336 (diff) | |
| parent | 1c77ead1fb14d64e6798fc5e32af04abcb3cebb4 (diff) | |
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/rdt.c')
| -rw-r--r-- | libavformat/rdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 158a8212e1..212e139f31 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -132,7 +132,7 @@ static int rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr) { AVIOContext pb; - int size; + unsigned int size; uint32_t tag; /** |