Browse Source

Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'

* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
  h264dec: make ff_h264_decode_init() static

Merged-by: Clément Bœsch <cboesch@gopro.com>
tags/n3.4
Clément Bœsch 8 years ago
parent
commit
20e72faef6
2 changed files with 3 additions and 4 deletions
  1. +3
    -3
      libavcodec/h264dec.c
  2. +0
    -1
      libavcodec/h264dec.h

+ 3
- 3
libavcodec/h264dec.c View File

@@ -388,7 +388,7 @@ static av_cold int h264_decode_end(AVCodecContext *avctx)

static AVOnce h264_vlc_init = AV_ONCE_INIT;

av_cold int ff_h264_decode_init(AVCodecContext *avctx)
static av_cold int h264_decode_init(AVCodecContext *avctx)
{
H264Context *h = avctx->priv_data;
int ret;
@@ -1072,7 +1072,7 @@ AVCodec ff_h264_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264,
.priv_data_size = sizeof(H264Context),
.init = ff_h264_decode_init,
.init = h264_decode_init,
.close = h264_decode_end,
.decode = h264_decode_frame,
.capabilities = /*AV_CODEC_CAP_DRAW_HORIZ_BAND |*/ AV_CODEC_CAP_DR1 |
@@ -1100,7 +1100,7 @@ AVCodec ff_h264_vdpau_decoder = {
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_H264,
.priv_data_size = sizeof(H264Context),
.init = ff_h264_decode_init,
.init = h264_decode_init,
.close = h264_decode_end,
.decode = h264_decode_frame,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU,


+ 0
- 1
libavcodec/h264dec.h View File

@@ -571,7 +571,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb,
const H2645NAL *nal, void *logctx);

void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl);
int ff_h264_decode_init(AVCodecContext *avctx);
void ff_h264_decode_init_vlc(void);

/**


Loading…
Cancel
Save