aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flashsv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-17 11:41:26 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-17 11:46:51 +0100
commit85b7b0c519f8d9491b4c0340329a605cc97c8984 (patch)
tree7990305137bc5ece3e78f58218e67982853383ea /libavcodec/flashsv.c
parent92cbd775687204f9750a09c69f97702719036aab (diff)
parent0ea430c75b8d90449d2878ad84669a2da2ad3cbc (diff)
downloadffmpeg-85b7b0c519f8d9491b4c0340329a605cc97c8984.tar.gz
Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'
* commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc': lclenc: use the AVFrame API properly. Conflicts: libavcodec/lclenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flashsv.c')
0 files changed, 0 insertions, 0 deletions