aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-09 19:09:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-09 19:09:56 +0200
commit438cfa9090a3330b609e4435a55fc8af1d193de7 (patch)
treea9ad062b727104d294a5be8bd3a157daf12626a7 /ffmpeg.c
parent598eb973a7a30510b970bf94bb60a2f6709d3d0d (diff)
parent64eb6892ec839fb11f5b62db38810efb638ba806 (diff)
downloadffmpeg-438cfa9090a3330b609e4435a55fc8af1d193de7.tar.gz
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
* qatar/release/0.6: Release notes for 0.6.6 Update changelog for 0.6.6 release Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions