Hi, On Sun, Oct 23, 2011 at 4:18 PM, Janne Grunau <[email protected]> wrote: > On Sun, Oct 23, 2011 at 09:14:38PM +0100, Måns Rullgård wrote: >> "Anton Khirnov " <[email protected]> writes: >> >> > Module: libav >> > Branch: master >> > Commit: da22ba7df461c13bf0b0eabc953303803a285d91 >> > >> > Author: Anton Khirnov <[email protected]> >> > Committer: Anton Khirnov <[email protected]> >> > Date: Wed Oct 19 09:28:45 2011 +0200 >> > >> > mpeg12: move full_pel from MpegEncContext to Mpeg1Context >> > >> > It's MPEG-1 specific. >> > >> > --- >> > >> > libavcodec/mpeg12.c | 15 ++++++++------- >> > libavcodec/mpeg12.h | 1 + >> > libavcodec/mpegvideo.h | 1 - >> > libavcodec/vdpau.c | 7 ++++--- >> > libavcodec/vdpau_internal.h | 3 ++- >> > 5 files changed, 15 insertions(+), 12 deletions(-) >> >> This appears to have broken threading. Easily reproduced with more than >> two threads. > > it broke slice threading, easiest solution is to revert. slice threading > and mpeg_decode_slice don't agree on which type to take. Before this > commit mpeg_decode_slice needed only MpegEncContext which is all the > slice threading has available it wasn't reflected in the code though. > > Janne > ---8<--- > This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91 since it > broke slice threading. Slice threading just duplicates MpegEncContext > so every value used during mpeg_decode_slice has to be in it. > A second patch will fix the illusion that Mpeg1Context is available > in mpeg_decode_slice. > --- > libavcodec/mpeg12.c | 15 +++++++-------- > libavcodec/mpeg12.h | 1 - > libavcodec/mpegvideo.h | 1 + > libavcodec/vdpau.c | 7 +++---- > libavcodec/vdpau_internal.h | 3 +-- > 5 files changed, 12 insertions(+), 15 deletions(-)
OK. Ronald _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
