aboutsummaryrefslogtreecommitdiffstats
path: root/compat/tms470
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-24 21:08:19 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-24 21:08:19 +0100
commit70a25587d22384bca8f102d68f5b65ebf3e421b2 (patch)
treeb34513c1054c23c3fa0a3bd80804fcd90bf8dfc7 /compat/tms470
parente66247e926aa270f087a66085b27c4636e8cf57c (diff)
parent67f2a688143b644f99360565a9f36c61a5f052e9 (diff)
downloadffmpeg-70a25587d22384bca8f102d68f5b65ebf3e421b2.tar.gz
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
* commit '67f2a688143b644f99360565a9f36c61a5f052e9': avconv: remove a write-only variable Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/tms470')
0 files changed, 0 insertions, 0 deletions