diff options
| author | jstebbins <[email protected]> | 2011-03-19 20:58:01 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-03-19 20:58:01 +0000 |
| commit | 24d2785ae92568533caed9528944167ca27e8905 (patch) | |
| tree | 6449a94ad4a22c66bfaddc8df9bce45080ceceb8 /libhb/muxmkv.c | |
| parent | de22836e9e399616ea04051eabd8b8cbedb4e8cb (diff) | |
Add mpeg-2 encoding support to libhb, cli, and lingui
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3853 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/muxmkv.c')
| -rw-r--r-- | libhb/muxmkv.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libhb/muxmkv.c b/libhb/muxmkv.c index 63f3e94cd..287f677fa 100644 --- a/libhb/muxmkv.c +++ b/libhb/muxmkv.c @@ -103,13 +103,20 @@ static int MKVInit( hb_mux_object_t * m ) if (job->areBframes) track->minCache = 1; break; - case HB_VCODEC_FFMPEG: + case HB_VCODEC_FFMPEG_MPEG4: track->codecID = MK_VCODEC_MP4ASP; track->codecPrivate = job->config.mpeg4.bytes; track->codecPrivateSize = job->config.mpeg4.length; if (job->areBframes) track->minCache = 1; break; + case HB_VCODEC_FFMPEG_MPEG2: + track->codecID = MK_VCODEC_MPEG2; + track->codecPrivate = job->config.mpeg4.bytes; + track->codecPrivateSize = job->config.mpeg4.length; + if (job->areBframes) + track->minCache = 1; + break; case HB_VCODEC_THEORA: { int i; @@ -451,7 +458,7 @@ static int MKVMux( hb_mux_object_t * m, hb_mux_data_t * mux_data, mk_addFrameData(m->file, mux_data->track, buf->data, buf->size); mk_setFrameFlags(m->file, mux_data->track, timecode, (((job->vcodec == HB_VCODEC_X264 || - job->vcodec == HB_VCODEC_FFMPEG) && + (job->vcodec & HB_VCODEC_FFMPEG_MASK)) && mux_data == job->mux_data) ? (buf->frametype == HB_FRAME_IDR) : ((buf->frametype & HB_FRAME_KEY) != 0)), 0 ); |