diff options
| author | titer <[email protected]> | 2006-04-17 18:50:02 +0000 |
|---|---|---|
| committer | titer <[email protected]> | 2006-04-17 18:50:02 +0000 |
| commit | b30c3a727aa539f10adeae2220b4aa48e0b18feb (patch) | |
| tree | eefa942e442271517817b3dcc3e9172e659fe4e0 /libhb/encavcodec.c | |
| parent | 82485cc9d132e1c284c9bd16dd8acd0094d42946 (diff) | |
Merge from avformat branch
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@60 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/encavcodec.c')
| -rw-r--r-- | libhb/encavcodec.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c index 155ff9b3e..f04606906 100644 --- a/libhb/encavcodec.c +++ b/libhb/encavcodec.c @@ -65,10 +65,14 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job ) context->gop_size = 10 * job->vrate / job->vrate_base; context->pix_fmt = PIX_FMT_YUV420P; - if( job->mux & HB_MUX_MP4 ) + if( job->mux & ( HB_MUX_MP4 | HB_MUX_PSP ) ) { context->flags |= CODEC_FLAG_GLOBAL_HEADER; } + if( job->mux & HB_MUX_PSP ) + { + context->flags |= CODEC_FLAG_BITEXACT; + } if( job->grayscale ) { context->flags |= CODEC_FLAG_GRAY; @@ -110,11 +114,17 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job ) } pv->context = context; - if( ( job->mux & HB_MUX_MP4 ) && job->pass != 1 ) + if( ( job->mux & ( HB_MUX_MP4 | HB_MUX_PSP ) ) && job->pass != 1 ) { +#if 0 /* Hem hem */ w->config->mpeg4.length = 15; memcpy( w->config->mpeg4.bytes, context->extradata + 15, 15 ); +#else + w->config->mpeg4.length = context->extradata_size; + memcpy( w->config->mpeg4.bytes, context->extradata, + context->extradata_size ); +#endif } return 0; |