[FFmpeg-cvslog] Merge commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f'

Michael Niedermayer git at videolan.org
Fri May 17 10:34:39 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 17 10:23:40 2013 +0200| [c453da33a3dee16724a734d08c0c7ba71c361b67] | committer: Michael Niedermayer

Merge commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f'

* commit '1fb013a57c6d98d3f425506eb25f32b2cf7ddc6f':
  vc1dec: Add support for interlaced B-frames

Conflicts:
	libavcodec/vc1dec.c

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

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





More information about the ffmpeg-cvslog mailing list