diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:07:03 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:07:03 +0100 |
| commit | 438ed974b832634c544facaf6de3a23e9e7d774a (patch) | |
| tree | e64ec8adb4d53435a816df57839693a44a7a690d /libavcodec/hevc_parser.c | |
| parent | b5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c (diff) | |
| parent | b667252a41fbf5a3f6ea8c67fdbc03db3d748977 (diff) | |
Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
h2645_parse: add support for parsing h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/hevc_parser.c')
| -rw-r--r-- | libavcodec/hevc_parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index 458a2ebd61..f4b65b58ad 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -89,7 +89,8 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf, HEVCParserContext *ctx = s->priv_data; int ret, i; - ret = ff_h2645_split_packet(&ctx->pkt, buf, buf_size, avctx, 0, 0); + ret = ff_h2645_split_packet(&ctx->pkt, buf, buf_size, avctx, 0, 0, + AV_CODEC_ID_HEVC); if (ret < 0) return ret; |