[FFmpeg-cvslog] Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 14:53:41 2014 +0200| [b06741d26794fd5ef2cd4e6b390c5ba7347e6a4e] | committer: Michael Niedermayer

Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'

* commit '79f2c426fde6e71c40b29504112d0528b85be623':
  dv: do not set codec timebase

Conflicts:
	libavformat/dv.c

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

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