Merge branch 'refs/heads/t/afh' into next
authorAndre Noll <maan@tuebingen.mpg.de>
Thu, 6 Jun 2019 06:36:16 +0000 (08:36 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Thu, 6 Jun 2019 06:36:16 +0000 (08:36 +0200)
* refs/heads/t/afh:
  Remove ->init() of struct receiver.
  afh: Constify definition of audio format handlers.
  afh: Introduce audio_format_names[].
  afh: Get rid of dummy entry at the end of afl[].
  afh: Minor simplification for afh_get_chunk().
  afh: Move audio_format_name() up.

1  2 
afh.c
mp3_afh.c
play.c

diff --cc afh.c
Simple merge
diff --cc mp3_afh.c
Simple merge
diff --cc play.c
Simple merge