Merge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:45:50 +0000 (13:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:45:50 +0000 (13:45 +0100)
commitbb3823d457104d883a81ee332a005ad42e80409f
treed87a2106ee62fb35957c1300c138a380b7425729
parent8ded1718bdf5ad0309a33a57e10b06a51139138d
parenta2816230c5c0a8fc72bc0163b7d21a96b194d87a
Merge commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a'

* commit 'a2816230c5c0a8fc72bc0163b7d21a96b194d87a':
  avframe: call release_buffer only if it is set

Conflicts:
libavcodec/utils.c

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