[FFmpeg-cvslog] Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'

Michael Niedermayer git at videolan.org
Sun Jan 6 23:45:23 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  6 23:41:19 2013 +0100| [a2aeaff40f34cb54bef55240f9cb8046385087d7] | committer: Michael Niedermayer

Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'

* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
  4xm: simplify code with FFSWAP
  4xm: return meaningful error codes

Conflicts:
	libavcodec/4xm.c

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

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





More information about the ffmpeg-cvslog mailing list