On Wed, 6 Mar 2013 20:15:52 +0100, Janne Grunau <[email protected]> wrote: > On 2013-03-04 11:35:15 +0100, Anton Khirnov wrote: > > --- > > libavcodec/dxva2_h264.c | 10 +++++----- > > libavcodec/h264.c | 34 +++++++++++++++++----------------- > > libavcodec/h264_direct.c | 16 ++++++++-------- > > libavcodec/h264_refs.c | 32 ++++++++++++++++---------------- > > libavcodec/mpegvideo.c | 26 +++++++++++++------------- > > libavcodec/mpegvideo.h | 2 ++ > > libavcodec/mpegvideo_enc.c | 4 ++-- > > libavcodec/svq3.c | 2 +- > > libavcodec/vaapi_h264.c | 10 +++++----- > > libavcodec/vdpau.c | 12 ++++++------ > > libavcodec/vdpau_h264.c | 12 ++++++------ > > 11 files changed, 81 insertions(+), 79 deletions(-) > > I think this was already ok-ed. any changes?
Don't think so. Maybe some trivial conflict resolutions. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
