[FFmpeg-cvslog] Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'
Michael Niedermayer
git at videolan.org
Sun Jul 27 12:36:05 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 27 12:23:53 2014 +0200| [c2ef844aa74c56b72a135fb389e346845ed7be50] | committer: Michael Niedermayer
Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'
* commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c':
eamad: use the bytestream2 API instead of AV_RL
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2ef844aa74c56b72a135fb389e346845ed7be50
---
More information about the ffmpeg-cvslog
mailing list