aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/f_zmq.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-01 13:06:25 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-01 13:06:25 +0100
commit0ddcee172ec8a8abc91c61c3a66bbfd432373976 (patch)
tree1e4db2cfc0356f93d88fa9858a5d49618f4a2435 /libavfilter/f_zmq.c
parent13ecdb06f8503c852546b017e7e861e10d9f416f (diff)
parent0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b (diff)
downloadffmpeg-0ddcee172ec8a8abc91c61c3a66bbfd432373976.tar.gz
Merge commit '0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b' into release/2.4
* commit '0b41eeac45fb7f7ad6d3f4fc846b00d108824b0b': hevc_mvs: make sure to always initialize the temporal MV fully Conflicts: libavcodec/hevc_mvs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/f_zmq.c')
0 files changed, 0 insertions, 0 deletions