diff options
| author | Rodeo <[email protected]> | 2013-08-22 20:33:35 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-08-22 20:33:35 +0000 |
| commit | d41905d539046445e1b81499ff7bd04d170c91d4 (patch) | |
| tree | 3f39a09e757bca8bc461d46303a2cb1c35e8d9a6 /libhb/muxavformat.c | |
| parent | c1a493b581f0567eba92625f2ee132de8e7f1d6d (diff) | |
Big merge, QSV to trunk: part 1 (tracked files).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5737 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxavformat.c')
| -rw-r--r-- | libhb/muxavformat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c index 767e8d314..ff53ebbe9 100644 --- a/libhb/muxavformat.c +++ b/libhb/muxavformat.c @@ -207,6 +207,7 @@ static int avformatInit( hb_mux_object_t * m ) switch (job->vcodec) { case HB_VCODEC_X264: + case HB_VCODEC_QSV_H264: track->st->codec->codec_id = AV_CODEC_ID_H264; /* Taken from x264 muxers.c */ @@ -1015,8 +1016,8 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu pkt.pts = pts; pkt.duration = duration; - if (track->type == MUX_TYPE_VIDEO && - (job->vcodec == HB_VCODEC_X264 || job->vcodec & HB_VCODEC_FFMPEG_MASK)) + if (track->type == MUX_TYPE_VIDEO && ((job->vcodec & HB_VCODEC_H264_MASK) || + (job->vcodec & HB_VCODEC_FFMPEG_MASK))) { if (buf->s.frametype == HB_FRAME_IDR) pkt.flags |= AV_PKT_FLAG_KEY; |