Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 10:53:35 +0000 (12:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 10:53:42 +0000 (12:53 +0200)
commit40c9d43086890df11389ceefd88f517471e41202
tree5c2b7d011601788d6a5dfcdf6f09897e18c7c1ed
parent7f5296005c392d72f574b66324c1db8d1a7a6484
parent44671b57866aab8dd36715ff010e985e25baaf19
Merge commit '44671b57866aab8dd36715ff010e985e25baaf19'

* commit '44671b57866aab8dd36715ff010e985e25baaf19':
  AVFrame: factor out freeing the side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c