[FFmpeg-cvslog] Merge commit '387bef95d28019c13c6805cfa4079e59948284e5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec  5 17:02:36 2012 +0100| [022553e875094565417d32b82975f56be8384820] | committer: Michael Niedermayer

Merge commit '387bef95d28019c13c6805cfa4079e59948284e5'

* commit '387bef95d28019c13c6805cfa4079e59948284e5':
  lavc: factorise setting buffer type in avcodec_default_get_buffer().

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=022553e875094565417d32b82975f56be8384820
---