diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-11-02 11:47:34 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-12-02 15:04:24 -0500 |
| commit | 25fcbf7a84a485ae358f3fb3519ed4e8a98459cd (patch) | |
| tree | 918c3402bb7db3b527642dad8041c7b59666e877 | |
| parent | 46fae40d253747187bed0c00ca8e3d89a3226976 (diff) | |
| download | ffmpeg-25fcbf7a84a485ae358f3fb3519ed4e8a98459cd.tar.gz | |
hevc: Support extradata changes
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| -rw-r--r-- | libavcodec/hevc.c | 10 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 441f5ab87c..7c563a34ba 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -3049,6 +3049,8 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, AVPacket *avpkt) { int ret; + int new_extradata_size; + uint8_t *new_extradata; HEVCContext *s = avctx->priv_data; if (!avpkt->size) { @@ -3060,6 +3062,14 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, return 0; } + new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, + &new_extradata_size); + if (new_extradata && new_extradata_size > 0) { + ret = hevc_decode_extradata(s, new_extradata, new_extradata_size); + if (ret < 0) + return ret; + } + s->ref = NULL; ret = decode_nal_units(s, avpkt->data, avpkt->size); if (ret < 0) diff --git a/libavcodec/version.h b/libavcodec/version.h index c28867a1ff..69aae45389 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 66 -#define LIBAVCODEC_VERSION_MICRO 108 +#define LIBAVCODEC_VERSION_MICRO 109 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavformat/mov.c b/libavformat/mov.c index 88a79da92d..6fb938a0e0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2232,10 +2232,6 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, avio_skip(pb, size); return 1; } - if ( codec_tag == AV_RL32("hvc1") || - codec_tag == AV_RL32("hev1") - ) - av_log(c->fc, AV_LOG_WARNING, "Concatenated H.264 or H.265 might not play correctly.\n"); return 0; } |