[FFmpeg-cvslog] Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'

Michael Niedermayer git at videolan.org
Tue Nov 11 22:28:39 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 22:19:54 2014 +0100| [4809ac75fcefe198e70936d49160036818f12e2b] | committer: Michael Niedermayer

Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'

* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
  dvbsubdec: improve error checking

Conflicts:
	libavcodec/dvbsubdec.c

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

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





More information about the ffmpeg-cvslog mailing list