[FFmpeg-cvslog] Merge commit '58a868968df445068a143f327ced03b6a02baf0d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 04:03:05 2013 +0100| [28eacd135162e34379b5c0146ad41a3601f35cd8] | committer: Michael Niedermayer

Merge commit '58a868968df445068a143f327ced03b6a02baf0d'

* commit '58a868968df445068a143f327ced03b6a02baf0d':
  FATE: drop the last partial frame in the wmv8-drm test

Conflicts:
	tests/ref/fate/wmv8-drm

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28eacd135162e34379b5c0146ad41a3601f35cd8
---