[FFmpeg-cvslog] Merge commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47' into release/2.2
Michael Niedermayer
git at videolan.org
Wed Jul 30 20:12:10 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 30 19:59:38 2014 +0200| [357325603719a1283a7375b6df9ddb7fafe203fe] | committer: Michael Niedermayer
Merge commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47' into release/2.2
* commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47':
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=357325603719a1283a7375b6df9ddb7fafe203fe
---
More information about the ffmpeg-cvslog
mailing list