diff options
Diffstat (limited to 'libavcodec/h264_mc_template.c')
| -rw-r--r-- | libavcodec/h264_mc_template.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index a3af39b..a59d6a2 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -2,20 +2,20 @@ * H.26L/H.264/AVC/JVT/14496-10/... decoder * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -71,7 +71,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y, const int mb_xy = h->mb_xy; const int mb_type = s->current_picture.f.mb_type[mb_xy]; - assert(IS_INTER(mb_type)); + av_assert2(IS_INTER(mb_type)); if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME)) await_references(h); @@ -103,7 +103,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y, } else { int i; - assert(IS_8X8(mb_type)); + av_assert2(IS_8X8(mb_type)); for (i = 0; i < 4; i++) { const int sub_mb_type = h->sub_mb_type[i]; @@ -141,7 +141,7 @@ static void MCFUNC(hl_motion)(H264Context *h, uint8_t *dest_y, IS_DIR(sub_mb_type, 0, 0), IS_DIR(sub_mb_type, 0, 1)); } else { int j; - assert(IS_SUB_4X4(sub_mb_type)); + av_assert2(IS_SUB_4X4(sub_mb_type)); for (j = 0; j < 4; j++) { int sub_x_offset = x_offset + 2 * (j & 1); int sub_y_offset = y_offset + (j & 2); |
