[FFmpeg-cvslog] Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'

Michael Niedermayer git at videolan.org
Wed Apr 17 16:20:03 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 17 16:10:23 2013 +0200| [4916e220a60a08c8bf6c7da0786e4a29b14d93d6] | committer: Michael Niedermayer

Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'

* commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36':
  rv10: return meaningful error codes.

Conflicts:
	libavcodec/rv10.c

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

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





More information about the ffmpeg-cvslog mailing list