Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 10:23:53 +0000 (12:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 10:27:01 +0000 (12:27 +0200)
commitc2ef844aa74c56b72a135fb389e346845ed7be50
tree1ae29afaba4d1a9e8cf1b63dbd7670ebabfc9648
parentc437765be7628c9dacb64aa1c1c46c0c39df1ca9
parent541427ab4d5b4b6f5a90a687a06decdb78e7bc3c
Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'

* commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c':
  eamad: use the bytestream2 API instead of AV_RL

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/eamad.c