aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/timefilter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-29 13:05:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-29 13:05:37 +0100
commit2a9443a110e1865523fee32404890097fb6d1d93 (patch)
tree1efe4011946d8d0dde56c2394188e85751f2c05c /libavdevice/timefilter.c
parentba34e56c0d39e0aa4c93241623b63db81dfef79b (diff)
parent69583bd3b1eba471366141c945030c163e073e02 (diff)
downloadffmpeg-2a9443a110e1865523fee32404890097fb6d1d93.tar.gz
Merge commit '69583bd3b1eba471366141c945030c163e073e02'
* commit '69583bd3b1eba471366141c945030c163e073e02': avfilter: Refactor unconditional filter registration build: Add rtpenc_chain extra config option configure: Add --disable-all command line option Conflicts: libavfilter/allfilters.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/timefilter.c')
0 files changed, 0 insertions, 0 deletions