aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/targa.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-21 16:32:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-21 16:33:51 +0200
commit1552b850db5472f2fa023040d207779bca311820 (patch)
treed1c75095f6268fbe38a319ba57737bfa7b7be76e /libavcodec/targa.h
parent47e18e2e03c92a9e344e98c021021248408754db (diff)
parentb1432e905d462198a8d7834b256848f2b9e4f8e6 (diff)
downloadffmpeg-1552b850db5472f2fa023040d207779bca311820.tar.gz
Merge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1
* commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6': avfilter: Add missing emms_c when needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/targa.h')
0 files changed, 0 insertions, 0 deletions