[FFmpeg-cvslog] Merge commit '187cfd3c13a1deb47661486824a5b8f41e158a7a' into release/0.10
Michael Niedermayer
git at videolan.org
Sat Aug 9 19:12:44 CEST 2014
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 9 18:59:24 2014 +0200| [d60f680fa741cda235a361c85ea246939201576f] | committer: Michael Niedermayer
Merge commit '187cfd3c13a1deb47661486824a5b8f41e158a7a' into release/0.10
* commit '187cfd3c13a1deb47661486824a5b8f41e158a7a':
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=d60f680fa741cda235a361c85ea246939201576f
---
More information about the ffmpeg-cvslog
mailing list