[FFmpeg-cvslog] Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'
Michael Niedermayer
git at videolan.org
Thu Jun 13 12:49:32 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 12:21:36 2013 +0200| [e5558391b5aee8e0a99ac10ba9ecd4727439b69a] | committer: Michael Niedermayer
Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'
* commit 'b8b809908ec547b2609dbac24194f4fd2df61aea':
4xm: forward errors from decode_p_block
Conflicts:
libavcodec/4xm.c
Impossible to be false check has been replaced by av_assert0()
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5558391b5aee8e0a99ac10ba9ecd4727439b69a
---
More information about the ffmpeg-cvslog
mailing list