[FFmpeg-cvslog] Merge commit '1115689d54ea95a084421f5a182b8dc56cbff978'
Michael Niedermayer
git at videolan.org
Tue Sep 17 15:13:57 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 15:07:09 2013 +0200| [a64b99503b962c757908e6796fc224aae23732ae] | committer: Michael Niedermayer
Merge commit '1115689d54ea95a084421f5a182b8dc56cbff978'
* commit '1115689d54ea95a084421f5a182b8dc56cbff978':
svq3: Check for any negative return value from ff_h264_check_intra_pred_mode
Conflicts:
libavcodec/svq3.c
See: 019eb2c77b7c315580200a5dbe6dabb1c97a3764
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a64b99503b962c757908e6796fc224aae23732ae
---
More information about the ffmpeg-cvslog
mailing list