virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'

Browse Source 
* commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153':
  hevcdec: split ff_hevc_diag_scan* declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-23 15:12:23 -03:00
commit b29c8c995f
8 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/dxva2_hevc.c
View File

@ -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

1
libavcodec/hevc_cabac.c
View File

@ -25,6 +25,7 @@
#include "libavutil/common.h"
#include "cabac_functions.h"
#include "hevc_data.h"
#include "hevcdec.h"
#define CABAC_MAX_BIN 31

2
libavcodec/hevc_data.c
View File

@ -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,

31
libavcodec/hevc_data.h Normal file
View File

@ -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 */

1
libavcodec/hevc_ps.c
View File

@ -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,

1
libavcodec/hevcdec.c
View File

@ -38,6 +38,7 @@
#include "cabac_functions.h"
#include "golomb.h"
#include "hevc.h"
#include "hevc_data.h"
#include "hevcdec.h"
#include "profiles.h"

5
libavcodec/hevcdec.h
View File

@ -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 */

1
libavcodec/vdpau_hevc.c
View File

@ -24,6 +24,7 @@
#include "avcodec.h"
#include "internal.h"
#include "hevc_data.h"
#include "hevcdec.h"
#include "hwaccel.h"
#include "vdpau.h"