ffmpeg | branch: release/0.10 | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d60f680fa741cda235a361c85ea246939201576f
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
