On Mon, May 14, 2012 at 06:46:05PM +0200, Diego Biurrun wrote: > On Mon, May 14, 2012 at 05:43:02PM +0100, Måns Rullgård wrote: > > Diego Biurrun <[email protected]> writes: > > > > > --- > > > tests/fate/adpcm.mak | 10 +++--- > > > tests/fate/audio.mak | 4 +- > > > tests/fate/demux.mak | 2 +- > > > tests/fate/image.mak | 4 +- > > > tests/fate/microsoft.mak | 16 +++++----- > > > tests/fate/pcm.mak | 20 ++++++------ > > > tests/fate/utvideo.mak | 32 > > > ++++++++++---------- > > > .../{adpcm-ima_wav-stereo => adpcm-ima-wav-stereo} | 0 > > > .../ref/fate/{adpcm_ms-stereo => adpcm-ms-stereo} | 0 > > > tests/ref/fate/{pcm_dvd => pcm-dvd} | 0 > > > .../fate/{pcm_s16be-stereo => pcm-s16be-stereo} | 0 > > > .../fate/{pcm_s16le-stereo => pcm-s16le-stereo} | 0 > > > tests/ref/fate/{pcm_u8-mono => pcm-u8-mono} | 0 > > > tests/ref/fate/{pcm_u8-stereo => pcm-u8-stereo} | 0 > > > ...aster-8bit_gray-raw => sunraster-8bit-gray-raw} | 0 > > > .../fate/{utvideo_rgb_left => utvideo-rgb-left} | 0 > > > .../{utvideo_rgb_median => utvideo-rgb-median} | 0 > > > .../fate/{utvideo_rgba_left => utvideo-rgba-left} | 0 > > > .../{utvideo_rgba_median => utvideo-rgba-median} | 0 > > > .../{utvideo_yuv420_left => utvideo-yuv420-left} | 0 > > > ...utvideo_yuv420_median => utvideo-yuv420-median} | 0 > > > .../{utvideo_yuv422_left => utvideo-yuv422-left} | 0 > > > ...utvideo_yuv422_median => utvideo-yuv422-median} | 0 > > > tests/ref/fate/{vc1_sa00040 => vc1-sa00040} | 0 > > > tests/ref/fate/{vc1_sa00050 => vc1-sa00050} | 0 > > > tests/ref/fate/{vc1_sa10091 => vc1-sa10091} | 0 > > > tests/ref/fate/{vc1_sa20021 => vc1-sa20021} | 0 > > > tests/ref/fate/{ws_snd => ws-snd} | 0 > > > 28 files changed, 44 insertions(+), 44 deletions(-) > > > > This conflicts massively with something I'm working on. Since this > > looks fairly automatic, can you please hold it off for a few days? > > Sure. Are you OK with the patch in principle? I don't want to rebase > it on top of upcoming changes in vain. Otherwise just let me know > when you are finished and I'll rebase it on top of HEAD and push then.
.. ping .. Looks like your conflicting work has been pushed by now. Can I go ahead, rebase and push this one? Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
