aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-06-20 13:22:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-06-20 13:22:23 +0200
commit54dd50d14dc3a3952f7d85165142d02f6ea578d7 (patch)
treed91ada2dbd1394e4bfa1f16534a993fd16dc7e4f /libavcodec
parent56e11d230525bb9659e79d3253351b94ec3f8478 (diff)
downloadffmpeg-54dd50d14dc3a3952f7d85165142d02f6ea578d7.tar.gz
cmdutils: remove outcommented merge trash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions