aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE.md
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-30 23:46:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-30 23:46:58 +0200
commit2c180cfc5dd549c90cbbb3b02e9c67ce6b55cbec (patch)
tree3ee147797375df9e2206d79f7149a9bc94a31c31 /LICENSE.md
parent95cf5e83a750fb886eb8c509e0f907eabda96d1a (diff)
parent70642090960c35dcd6da941c869bdf55d4f3bb00 (diff)
downloadffmpeg-2c180cfc5dd549c90cbbb3b02e9c67ce6b55cbec.tar.gz
Merge commit '70642090960c35dcd6da941c869bdf55d4f3bb00' into release/2.4
* commit '70642090960c35dcd6da941c869bdf55d4f3bb00': msrle: Use FFABS to determine the frame size in msrle_decode_pal4 Conflicts: libavcodec/msrledec.c See: f7e1367f58263593e6cee3c282f7277d7ee9d553 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'LICENSE.md')
0 files changed, 0 insertions, 0 deletions