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)
commit022553e875094565417d32b82975f56be8384820
tree4793301de5e9decc89e0ed3fd8ddb52bae3f0386
parent83db6cb521c699bec23e542b8fd24a3afc0dfc60
parent387bef95d28019c13c6805cfa4079e59948284e5
Merge commit '387bef95d28019c13c6805cfa4079e59948284e5'

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

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