summaryrefslogtreecommitdiff
path: root/libavcodec/fraps.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-06 15:11:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-06 15:16:51 +0100
commitddc3ca2caa4a78f0e6824d0d19bc98cfd955b333 (patch)
treec5f3853a3433eec3cdd35f93b9753affd8b1eb5e /libavcodec/fraps.c
parent6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7 (diff)
parentda7baaaae79b4d7d715d35ea6bcfbdd149edc177 (diff)
Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'
* commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177': aasc: fix output for msrle compression. msrledec: check bounds before constructing a possibly invalid pointer, cmdutils: remove ansi from the list of broken codecs. Conflicts: tests/ref/fate/aasc Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fraps.c')
0 files changed, 0 insertions, 0 deletions