Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'

Browse Source 
* commit '5da51284937649a8ebb84fa951c235438fcbf8ae':
  cavs: Add a dependency on h264chroma
  lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Conflicts:
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/19/head
Michael Niedermayer 12 years ago
parent ff9b607489 5da5128493
commit fa3a7b55ec
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libavcodec/h264.c

8
libavcodec/h264.c
Unescape View File

@ -68,7 +68,7 @@ static const uint8_t div6[QP_MAX_NUM + 1] = {
14,14,14,14, 14,14,14,14,
}; };
static const enum AVPixelFormat hwaccel_pixfmt_list_h264_420[] = { static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = {
#if CONFIG_H264_DXVA2_HWACCEL #if CONFIG_H264_DXVA2_HWACCEL
AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_DXVA2_VLD,
#endif #endif
@ -85,7 +85,7 @@ static const enum AVPixelFormat hwaccel_pixfmt_list_h264_420[] = {
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
static const enum AVPixelFormat hwaccel_pixfmt_list_h264_jpeg_420[] = { static const enum AVPixelFormat h264_hwaccel_pixfmt_list_jpeg_420[] = {
#if CONFIG_H264_DXVA2_HWACCEL #if CONFIG_H264_DXVA2_HWACCEL
AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_DXVA2_VLD,
#endif #endif
@ -2972,8 +2972,8 @@ static enum PixelFormat get_pixel_format(H264Context *h, int force_callback)
const enum AVPixelFormat * fmt = h->avctx->codec->pix_fmts ? const enum AVPixelFormat * fmt = h->avctx->codec->pix_fmts ?
h->avctx->codec->pix_fmts : h->avctx->codec->pix_fmts :
h->avctx->color_range == AVCOL_RANGE_JPEG ? h->avctx->color_range == AVCOL_RANGE_JPEG ?
hwaccel_pixfmt_list_h264_jpeg_420 : h264_hwaccel_pixfmt_list_jpeg_420 :
hwaccel_pixfmt_list_h264_420; h264_hwaccel_pixfmt_list_420;
for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++) for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
if (fmt[i] == h->avctx->pix_fmt && !force_callback) if (fmt[i] == h->avctx->pix_fmt && !force_callback)

Write Preview
Loading…
Cancel
Save