Merge commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 17:59:38 +0000 (19:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 17:59:38 +0000 (19:59 +0200)
commit357325603719a1283a7375b6df9ddb7fafe203fe
tree2cb811d8debf9e510ce1fd346f813f3f6786dfcc
parent4ddac7199b247e4ed04296db944f29f5148e9860
parentf9204ec56a4cf73843d1e5b8563d3584c2c05b47
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@gmx.at>
libavcodec/eamad.c