[FFmpeg-cvslog] Merge commit '582963a8156522582e55466be4a59974a8d909a5'

Michael Niedermayer git at videolan.org
Fri Jul 26 10:57:34 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 26 10:51:42 2013 +0200| [bbc7d33a0d7dad79f3d514349b0ba321121b80fe] | committer: Michael Niedermayer

Merge commit '582963a8156522582e55466be4a59974a8d909a5'

* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
	libavcodec/vdpau_vc1.c

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

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





More information about the ffmpeg-cvslog mailing list