diff options
| author | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-12-31 16:54:11 +0000 |
| commit | 01d1b85d7adecdc588d5450ee43c52809c0b1c3f (patch) | |
| tree | 4f08f2381a18b4e62c4e5a82d7b610c68e8f1432 /libhb/decmpeg2.c | |
| parent | b96ca4f7de03e2c1b2d6865a0ae65798c1afed6f (diff) | |
Bump libav to v9_beta3.
Miscellaneous bugfixes and improvements.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5124 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/decmpeg2.c')
| -rw-r--r-- | libhb/decmpeg2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libhb/decmpeg2.c b/libhb/decmpeg2.c index 991feb8e9..15c0d21d5 100644 --- a/libhb/decmpeg2.c +++ b/libhb/decmpeg2.c @@ -44,7 +44,7 @@ typedef struct hb_libmpeg2_s int height; int rate; double aspect_ratio; - enum PixelFormat pixfmt; + enum AVPixelFormat pixfmt; int got_iframe; /* set when we get our first iframe */ int look_for_iframe; /* need an iframe to add chap break */ int look_for_break; /* need gop start to add chap break */ @@ -272,7 +272,7 @@ static hb_buffer_t *hb_copy_frame( hb_libmpeg2_t *m ) hb_job_t * job = m->job; int width = m->info->sequence->width; int height = m->info->sequence->height; - enum PixelFormat pixfmt = m->pixfmt; + enum AVPixelFormat pixfmt = m->pixfmt; uint8_t *y = m->info->display_fbuf->buf[0]; uint8_t *u = m->info->display_fbuf->buf[1]; uint8_t *v = m->info->display_fbuf->buf[2]; @@ -423,11 +423,11 @@ static int hb_libmpeg2_decode( hb_libmpeg2_t * m, hb_buffer_t * buf_es, if ( m->info->sequence->width >> 1 == m->info->sequence->chroma_width && m->info->sequence->height >> 1 == m->info->sequence->chroma_height ) { - m->pixfmt = PIX_FMT_YUV420P; + m->pixfmt = AV_PIX_FMT_YUV420P; } else { - m->pixfmt = PIX_FMT_YUV422P; + m->pixfmt = AV_PIX_FMT_YUV422P; } } else if( state == STATE_GOP && m->look_for_break) |