Merge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 16:52:03 +0000 (18:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 16:53:32 +0000 (18:53 +0200)
commit23dec54c5dca76024397b1e3a88b606b0b21161a
tree521ed3aa45c3ea2b0a804c2d0b7be1aa79c3e229
parent05eb0f125c709af1a100f4e649524e80743d1d40
parent0d6d4a9e4a626be6ff55839eab4114aeac45ba88
Merge commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88'

* commit '0d6d4a9e4a626be6ff55839eab4114aeac45ba88':
  avstring-test: Mark pointer passed to av_free() as non-const

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