aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mvcdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-03 23:34:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-03 23:35:08 +0100
commit1dc1c4e7a82edb13420f064890fbde3751ca18c9 (patch)
tree753d0901163e607d9a4ecb73b19b3f88e0af2399 /libavcodec/mvcdec.c
parent741b56fceece2b2de53466b952ed60b61544cc60 (diff)
parenta6653787a4b1e89170ff7962312dd110769c83a3 (diff)
downloadffmpeg-1dc1c4e7a82edb13420f064890fbde3751ca18c9.tar.gz
Merge commit 'a6653787a4b1e89170ff7962312dd110769c83a3'
* commit 'a6653787a4b1e89170ff7962312dd110769c83a3': libopencv: Check kernel_str life cycle Conflicts: libavfilter/vf_libopencv.c See: f16a6f667c993a158643b52815ec42961508b0a9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mvcdec.c')
0 files changed, 0 insertions, 0 deletions