[FFmpeg-cvslog] Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'

Michael Niedermayer git at videolan.org
Sat Feb 14 20:37:09 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 14 20:29:34 2015 +0100| [4177f501b433a59edcdb8368f02082514f55f580] | committer: Michael Niedermayer

Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'

* commit '7769be590c7aeb2aad26ca723d105cf5203e33d2':
  vp56: Return meaningful error codes

Conflicts:
	libavcodec/vp56.c

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

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





More information about the ffmpeg-cvslog mailing list