aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/proresenc_kostya.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-18 17:30:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-18 17:30:53 +0100
commit523c8e0503dcf99f67ea909dea2ca5e56d9ff091 (patch)
tree1b9a5e34ff578050ac2818ede280be7dbd3be612 /libavcodec/proresenc_kostya.c
parent6abb554fd698d43726302b68999b96f429c7d3ba (diff)
parent50c449ac24fbb4c03c15d2e2026cef2204b80385 (diff)
downloadffmpeg-523c8e0503dcf99f67ea909dea2ca5e56d9ff091.tar.gz
Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'
* commit '50c449ac24fbb4c03c15d2e2026cef2204b80385': iff: validate CMAP palette size asfenc: return error on negative timestamp Conflicts: libavformat/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresenc_kostya.c')
0 files changed, 0 insertions, 0 deletions