Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 12:36:24 +0000 (14:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 13:08:04 +0000 (15:08 +0200)
commit476471495265a5bfa52f1235aa432d7409e28136
tree39c92070d755abaa2d2a823e3388633bd12a11fe
parent8945dcbb52b6b87e1e6479912cce89c7da54ec43
parentad8159e0fe2bfc1c34739f0956ce464f9859b5a7
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h

See: ba856c0be5599f21f241162e1f5f3f2506f3132c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/settb.c
libavfilter/version.h