Merge commit '187cfd3c13a1deb47661486824a5b8f41e158a7a' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 16:59:24 +0000 (18:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:04:40 +0000 (19:04 +0200)
commitd60f680fa741cda235a361c85ea246939201576f
tree1a761f3e15e1c3c82b593a74d96044938bfbf15f
parent9153b33a742c4e2a85ff6230aea0e75f5a8b26c2
parent187cfd3c13a1deb47661486824a5b8f41e158a7a
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@gmx.at>
libavcodec/eamad.c