Michael Niedermayer 67731ef40f Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  avutil: doxy: Small clarification for av_buffer_create()
  avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
  avcodec: doxy: Clarify what get_buffer2 must fill in buf[]

Conflicts:
	libavutil/buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-05-01 18:33:30 +02:00

9.5 KiB

Raw Blame History

View Raw