[vlc-commits] picture_BlendSubpicture: remove assert on chroma incompatibility
Jean-Baptiste Kempf
git at videolan.org
Fri Dec 9 18:10:20 CET 2011
vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Dec 5 01:38:36 2011 +0100| [b255571c5cbd74664a16bb725c295e043b9575e8] | committer: Jean-Baptiste Kempf
picture_BlendSubpicture: remove assert on chroma incompatibility
Asserted when J42* blended on I42*, for example
Close #5516
(cherry picked from commit ac35f362851682736f1246e3b5c831e7a25e837d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=b255571c5cbd74664a16bb725c295e043b9575e8
---
src/misc/picture.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/misc/picture.c b/src/misc/picture.c
index a79c5b8..bf65fc5 100644
--- a/src/misc/picture.c
+++ b/src/misc/picture.c
@@ -400,7 +400,6 @@ int picture_Export( vlc_object_t *p_obj,
void picture_BlendSubpicture(picture_t *dst,
filter_t *blend, subpicture_t *src)
{
- assert(blend && dst && blend->fmt_out.video.i_chroma == dst->format.i_chroma);
assert(src && !src->b_fade && src->b_absolute);
for (subpicture_region_t *r = src->p_region; r != NULL; r = r->p_next) {
More information about the vlc-commits
mailing list