[FFmpeg-cvslog] r23369 - trunk/libavcodec/h264.c

[Baptiste Coudurier]

On 5/31/10 2:52 PM, Uoti Urpala wrote:
> On Mon, 2010-05-31 at 14:44 -0700, Baptiste Coudurier wrote:
>> On 5/31/10 2:27 PM, Carl Eugen Hoyos wrote:
>>> Baptiste Coudurier<baptiste.coudurier<at>   gmail.com>   writes:
>>>>>> @@ -1842,7 +1849,10 @@ static int decode_slice_header(H264Conte
>>>>>
>>>>>> -s-?avctx->pix_fmt = s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts);
>>>>>> +s->avctx->pix_fmt = s->avctx->get_format(s->avctx,
>>>>>> +                    s->avctx->color_range == AVCOL_RANGE_JPEG ?
>>>>>> +                    hwaccel_pixfmt_list_h264_jpeg_420 :
>>>>>> +                    ff_hwaccel_pixfmt_list_420);
>
>> Yes, how does this patch break it ? The only thing that changed is the
>> list passed to get_format, which now provide PIX_FMT_YUVJ420P instead of
>> PIX_FMT_YUV420P, and the ff_hwaccel_pix_fmt_list_420 is removed from the
>> AVCodec definition, because it is not static anymore.
>
> See the end of the file.
>      .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
>
> You're overriding that, and both the alternative lists are completely
> different.

Thanks, should be fixed now.
Btw, why is VDPAU using a different API than what VAAPI and DXVA are using ?

-- 
Baptiste COUDURIER
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
FFmpeg maintainer                                  http://www.ffmpeg.org