[FFmpeg-cvslog] Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 15 19:09:30 2014 +0100| [89e705cd5c94e6ccaa2969720de2f238c42c7e3c] | committer: Michael Niedermayer

Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'

* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
  dv: Drop a spurious check

Conflicts:
	libavcodec/dvdec.c

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

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