Michael Niedermayer ef2f9073dd Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4' ...

* commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4':
  rm: Use the correct codec_data_size signedness

Conflicts:
	libavformat/rm.h
	libavformat/rmdec.c

See: a6f730730b
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-12-06 00:48:47 +01:00

3.8 KiB

Raw Blame History

View Raw