Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:07:05 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:07:05 +0000 (13:07 +0100)
commita1ce060c5191dca1ef1927330de6ce413a402ffb
treeda9ec8c6ffe383da47ca01bfe13aa1a06ebc7137
parent252f56636ca0fc1d5223d091b1d56f6a5ab2b8af
parent5c439b41d0489412c0a4cf6dfb98915251677b8e
Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/version.h