summaryrefslogtreecommitdiffstats
path: root/libhb/muxavformat.c
diff options
context:
space:
mode:
authorRodeo <[email protected]>2014-02-28 00:29:48 +0000
committerRodeo <[email protected]>2014-02-28 00:29:48 +0000
commit733bdedc5f71442c535a8bcc1c239d77c7b15036 (patch)
treef42dd7646e229d589a5abf033e165252133030a7 /libhb/muxavformat.c
parent525c8a11b4930ff40a94897fc65ebea2fac7126f (diff)
Bump x265 to r6321 8a84c10e5116.
- rational framerates - libx265 now provides decode time stamps (DTS) - encx265: minor refactoring + prepare for muxing to MP4/Matroska git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6088 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxavformat.c')
-rw-r--r--libhb/muxavformat.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index 7aa4c1415..3e9d9b9e9 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -307,6 +307,22 @@ static int avformatInit( hb_mux_object_t * m )
}
} break;
+ case HB_VCODEC_X265:
+ track->st->codec->codec_id = AV_CODEC_ID_HEVC;
+
+ if (job->config.h265.headers_length > 0)
+ {
+ priv_size = job->config.h265.headers_length;
+ priv_data = av_malloc(priv_size);
+ if (priv_data == NULL)
+ {
+ hb_error("malloc failure");
+ goto error;
+ }
+ memcpy(priv_data, job->config.h265.headers, priv_size);
+ }
+ break;
+
default:
hb_error("muxavformat: Unknown video codec: %x", job->vcodec);
goto error;