aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-24 05:05:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-24 05:05:09 +0100
commitceaaf0d97e7fc11b850325201cf30d7b83e80fd2 (patch)
tree3a292ada4a203edbd584d3e2b0dcad5fa45fac35 /doc
parentc0237d19a0269ff44e909434f1b2b645fad2d281 (diff)
parent48b24bd2d208ce0f124029ac4c5ac5cb1fca4175 (diff)
downloadffmpeg-ceaaf0d97e7fc11b850325201cf30d7b83e80fd2.tar.gz
Merge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'
* commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175': ac3dec: Fix out-of-array read Conflicts: libavcodec/ac3dec.c See: 2cbf27b08a4991de608b305a8600b59467587605 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions