aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ptx.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-13 21:40:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-13 21:40:41 +0100
commitcbfc9046e1c7e295b74f252902ae6f255eef4e78 (patch)
treec7324363f40c83bbab3cd21a697ebfe982eeaf62 /libavcodec/ptx.c
parent96b02460fce59edca54fa2992c2d6e431596df9e (diff)
parentbbb64356cca65d7a2a33f59b2267ee58f28a061a (diff)
downloadffmpeg-cbfc9046e1c7e295b74f252902ae6f255eef4e78.tar.gz
Merge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a'
* commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a': build: Record dependency of eatqi decoder on dsputil Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ptx.c')
0 files changed, 0 insertions, 0 deletions