aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/dict.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-19 15:57:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-19 16:13:27 +0200
commit0b71cedfe8441b1ef1d1357d56b5dd6bd33407b2 (patch)
treecabcb5f93674b72f79e086ba7f72908d58ea7d8d /libavutil/dict.c
parent3a5b4afd911f596651f9ba67188ab01c8aea7bbf (diff)
parent3e1c9da38b849ce2982b516004370081fdd89ed0 (diff)
downloadffmpeg-0b71cedfe8441b1ef1d1357d56b5dd6bd33407b2.tar.gz
Merge commit '3e1c9da38b849ce2982b516004370081fdd89ed0' into release/2.4
* commit '3e1c9da38b849ce2982b516004370081fdd89ed0': matroskadec: fix crash when parsing invalid mkv See: d9fe6b926cd619c311e45e0ae352cf09713c482c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/dict.c')
0 files changed, 0 insertions, 0 deletions