[FFmpeg-cvslog] Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'

Michael Niedermayer git at videolan.org
Sun Jul 14 12:40:06 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 14 12:34:07 2013 +0200| [54623619373d316136d184153d0d7387acef6426] | committer: Michael Niedermayer

Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'

* commit '8435bca087c0e79385763c51de009fd89390b6a5':
  indeo4: Do not access missing reference MV

Conflicts:
	libavcodec/indeo4.c

See: 5216245a, aae44fb4

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

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





More information about the ffmpeg-cvslog mailing list