Please merge winff 1.0.4-2 (universe) from debian unstable (main)

Attached is the debdiff

This bug was fixed in the package winff - 1.0.4-2ubuntu1

---------------
winff (1.0.4-2ubuntu1) karmic; urgency=low

  * Merge from debian unstable (LP: #418765), remaining changes:
    - Changed rules file to install presets in line with ffmpeg in karmic.
    - Updated debian/README.debian
    - Added suggest on (k|x|)ubuntu-restricted-extras to control file to
      support presets.
    - Added text to description to explain that the a user needs to
      install libavcodec-unstripped-XX to use all presets.

winff (1.0.4-2) unstable; urgency=low

  * Bumped policy version to 3.8.3 (no changes needed)
  * Added patch system (dpatch)
  * Fix/improve lanquage support:
    - Added language from upstream forum: Simplified Chinese
    - Patch language files with upstream changes
      (debian/patches/10_update_languages.dpatch)
    - Rename winff.zh.po to winff.zh_TW.po because added zh_CN
    - Rename winff.pb.po to winff.pt_BR.po because pb is unknown
    - Rename winff.po to winff.en.po (and don't create soft-link)
  * Update copyright where appropriate (several translators transfered
    copyright to upstream.)
  * Add breaks shared-mime-info (< 0.40) to control because we use
    generic-icon in mime file (Closes: #541168)

 -- Paul Gevers <email address hidden> Tue, 25 Aug 2009 20:08:40 +0200