[FFmpeg-cvslog] Merge commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  8 13:51:59 2014 +0200| [c074feed292eb1d9371aaa3c63136d4cb241f8c5] | committer: Michael Niedermayer

Merge commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8' into release/1.1

* commit 'e8ff7972064631afbdf240ec6bfd9dec30cf2ce8':
  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=c074feed292eb1d9371aaa3c63136d4cb241f8c5
---