ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Mar 23 15:12:23 2017 -0300| [b29c8c995f17156204eb074e12b781a94b02c2a9] | committer: James Almer
Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153' * commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153': hevcdec: split ff_hevc_diag_scan* declarations into a separate header Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b29c8c995f17156204eb074e12b781a94b02c2a9 --- libavcodec/dxva2_hevc.c | 1 + libavcodec/hevc_cabac.c | 1 + libavcodec/hevc_data.c | 2 +- libavcodec/hevc_data.h | 31 +++++++++++++++++++++++++++++++ libavcodec/hevc_ps.c | 1 + libavcodec/hevcdec.c | 1 + libavcodec/hevcdec.h | 5 ----- libavcodec/vdpau_hevc.c | 1 + 8 files changed, 37 insertions(+), 6 deletions(-) diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c index 5de8b7c..fbf98ca 100644 --- a/libavcodec/dxva2_hevc.c +++ b/libavcodec/dxva2_hevc.c @@ -22,6 +22,7 @@ #include "libavutil/avassert.h" +#include "hevc_data.h" #include "hevcdec.h" // The headers above may include w32threads.h, which uses the original diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 969f372..205fc4e 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -25,6 +25,7 @@ #include "libavutil/common.h" #include "cabac_functions.h" +#include "hevc_data.h" #include "hevcdec.h" #define CABAC_MAX_BIN 31 diff --git a/libavcodec/hevc_data.c b/libavcodec/hevc_data.c index 0298fad..1633a41 100644 --- a/libavcodec/hevc_data.c +++ b/libavcodec/hevc_data.c @@ -20,7 +20,7 @@ #include <stdint.h> -#include "hevcdec.h" +#include "hevc_data.h" const uint8_t ff_hevc_diag_scan4x4_x[16] = { 0, 0, 1, 0, diff --git a/libavcodec/hevc_data.h b/libavcodec/hevc_data.h new file mode 100644 index 0000000..74558f0 --- /dev/null +++ b/libavcodec/hevc_data.h @@ -0,0 +1,31 @@ +/* + * HEVC shared data tables + * + * This file is part of FFmpeg. + * + * 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. + * + * 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 FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_HEVC_DATA_H +#define AVCODEC_HEVC_DATA_H + +#include <stdint.h> + +extern const uint8_t ff_hevc_diag_scan4x4_x[16]; +extern const uint8_t ff_hevc_diag_scan4x4_y[16]; +extern const uint8_t ff_hevc_diag_scan8x8_x[64]; +extern const uint8_t ff_hevc_diag_scan8x8_y[64]; + +#endif /* AVCODEC_HEVC_DATA_H */ diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index f9f04a5..53ff8b2 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -26,6 +26,7 @@ #include "libavutil/imgutils.h" #include "golomb.h" #include "hevcdec.h" +#include "hevc_data.h" static const uint8_t default_scaling_list_intra[] = { 16, 16, 16, 16, 17, 18, 21, 24, diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index aa54142..257eebc 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -38,6 +38,7 @@ #include "cabac_functions.h" #include "golomb.h" #include "hevc.h" +#include "hevc_data.h" #include "hevcdec.h" #include "profiles.h" diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 0866461..bad4fb2 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -1038,9 +1038,4 @@ extern const uint8_t ff_hevc_qpel_extra_before[4]; extern const uint8_t ff_hevc_qpel_extra_after[4]; extern const uint8_t ff_hevc_qpel_extra[4]; -extern const uint8_t ff_hevc_diag_scan4x4_x[16]; -extern const uint8_t ff_hevc_diag_scan4x4_y[16]; -extern const uint8_t ff_hevc_diag_scan8x8_x[64]; -extern const uint8_t ff_hevc_diag_scan8x8_y[64]; - #endif /* AVCODEC_HEVCDEC_H */ diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index c00e3b1..fcdf4b2 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "internal.h" +#include "hevc_data.h" #include "hevcdec.h" #include "hwaccel.h" #include "vdpau.h" ====================================================================== diff --cc libavcodec/hevc_cabac.c index 969f372,eb16f57..205fc4e --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@@ -25,6 -25,6 +25,7 @@@ #include "libavutil/common.h" #include "cabac_functions.h" ++#include "hevc_data.h" #include "hevcdec.h" #define CABAC_MAX_BIN 31 diff --cc libavcodec/hevc_data.h index 0000000,d1d2c33..74558f0 mode 000000,100644..100644 --- a/libavcodec/hevc_data.h +++ b/libavcodec/hevc_data.h @@@ -1,0 -1,31 +1,31 @@@ + /* + * HEVC shared data tables + * - * 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 + */ + + #ifndef AVCODEC_HEVC_DATA_H + #define AVCODEC_HEVC_DATA_H + + #include <stdint.h> + + extern const uint8_t ff_hevc_diag_scan4x4_x[16]; + extern const uint8_t ff_hevc_diag_scan4x4_y[16]; + extern const uint8_t ff_hevc_diag_scan8x8_x[64]; + extern const uint8_t ff_hevc_diag_scan8x8_y[64]; + + #endif /* AVCODEC_HEVC_DATA_H */ diff --cc libavcodec/hevc_ps.c index f9f04a5,44db326..53ff8b2 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@@ -24,8 -24,10 +24,9 @@@ */ #include "libavutil/imgutils.h" - #include "golomb.h" #include "hevcdec.h" + #include "hevc_data.h" static const uint8_t default_scaling_list_intra[] = { 16, 16, 16, 16, 17, 18, 21, 24, diff --cc libavcodec/vdpau_hevc.c index c00e3b1,8299456..fcdf4b2 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@@ -24,8 -24,8 +24,9 @@@ #include "avcodec.h" #include "internal.h" + #include "hevc_data.h" #include "hevcdec.h" +#include "hwaccel.h" #include "vdpau.h" #include "vdpau_internal.h" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
