Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 21:52:22 +0000 (23:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 21:52:46 +0000 (23:52 +0200)
commite0cdc68bdc0ee688b5e819d12ff151374f0cc988
tree5774f4042e3bdbbd56c38d7de3120e3c9be9c1f6
parent359a719f5fb15051bb94f7c389efacedfc3599b2
parent144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9
Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'

* commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9':
  avcodec/fic: clear slice_data

See: 1db8bc56488c888d57f5339812bd6f4117d85c3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>