[FFmpeg-cvslog] Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 03:15:55 2014 +0200| [7e8fdf05e09a749ac74cf4b26797e44305a2b068] | committer: Michael Niedermayer

Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'

* commit '593d2326ef985cdffe413df629419938f7b07c4c':
  dv: Replace a magic number by sizeof()

Conflicts:
	libavcodec/dv.c

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

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