Merge svn changes up to r30437
commit6ece23f1b12e80960c66a8596a3c927bf7ee8621
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 27 Jan 2010 22:37:32 +0000 (28 00:37 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Wed, 27 Jan 2010 22:37:32 +0000 (28 00:37 +0200)
tree0163085cfa02840fe8b0e994657583120e8f574a
parent167322fa33b6efbc1f1d681327b4a928ba0b706a
parentb1f3c590c79534efb970220d4c186063adb225aa
Merge svn changes up to r30437
DOCS/man/en/mplayer.1
etc/codecs.conf
libmpcodecs/ad_ffmpeg.c
libmpcodecs/ad_pcm.c
libmpcodecs/vf_cropdetect.c
libmpdemux/asfheader.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h