[FFmpeg-cvslog] Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'
Michael Niedermayer
git at videolan.org
Sat Jan 26 14:58:54 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 26 14:47:08 2013 +0100| [325ee4ed7ad2aefb45c0f917285d04b3c3503f40] | committer: Michael Niedermayer
Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'
* commit 'f337c29017b10c98ccb4dce20efced4c74b665f6':
eatgq: return meaningful error codes.
eatgv: cosmetics, reformat
Conflicts:
libavcodec/eatgq.c
libavcodec/eatgv.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=325ee4ed7ad2aefb45c0f917285d04b3c3503f40
---
More information about the ffmpeg-cvslog
mailing list