Merge commit '884c7a6eb86a9bc05abafc058b279018ded7de5f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:13:23 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:17:39 +0000 (13:17 +0100)
commit054e4bab83b789a4f958d6d8f56418e34c279e4b
treeda9ec8c6ffe383da47ca01bfe13aa1a06ebc7137
parenta1ce060c5191dca1ef1927330de6ce413a402ffb
parent884c7a6eb86a9bc05abafc058b279018ded7de5f
Merge commit '884c7a6eb86a9bc05abafc058b279018ded7de5f'

* commit '884c7a6eb86a9bc05abafc058b279018ded7de5f':
  avfilter: fix const use of avfilter_next

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