Merge commit '387bef95d28019c13c6805cfa4079e59948284e5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 16:02:36 +0000 (17:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 16:02:42 +0000 (17:02 +0100)
* commit '387bef95d28019c13c6805cfa4079e59948284e5':
  lavc: factorise setting buffer type in avcodec_default_get_buffer().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/utils.c

Simple merge