[FFmpeg-cvslog] Merge commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef' into release/2.2

Michael Niedermayer git at videolan.org
Mon Aug 11 18:58:45 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 11 18:49:37 2014 +0200| [c11b3010c21a194a9e8da7f07c918ce1276e3d10] | committer: Michael Niedermayer

Merge commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef' into release/2.2

* commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef':
  cdgraphics: do not return 0 from the decode function

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

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





More information about the ffmpeg-cvslog mailing list