Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:13:58 +0000 (10:13 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:13:58 +0000 (10:13 +0100)
* commit 'cc4c24208159200b7aff5b5c313903c7f23fa345':
  avresample: Mark avresample_buffer() as pointer to const

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavresample/audio_data.c
libavresample/audio_data.h
libavresample/avresample.h
libavresample/utils.c

Simple merge
Simple merge
Simple merge
Simple merge