ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Dec  6 
00:41:00 2014 +0100| [ef2f9073dda3a1ce73f44d444bc27fae5707f396] | committer: 
Michael Niedermayer

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 <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef2f9073dda3a1ce73f44d444bc27fae5707f396
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to