Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Jun 2013 06:27:35 +0000 (08:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Jun 2013 06:27:35 +0000 (08:27 +0200)
commit209cb8afe0092e66411d730b85139947cc706708
tree6f70969604b0f7a2f2fb8d1f89f2e04cd6575f74
parent9ead06057acfcc43bcb99a63a7c58543007b2847
parentc9c7bc4493bc72254cfb826941cdaf56c9b110d6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()

Conflicts:
libavfilter/audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/audio.c