[vlc-devel] Some commits have disappeared

[Romain Vimont]

Hi,

When I git-pulled this morning, it refused:

    fatal: Not possible to fast-forward, aborting.

Some commits I retrieved previously have been removed from the master
branch:

    $ git log --oneline origin/master..master
    e326d846bf (master) decoder: make sure decoder updates use enough output pictures
    270d501bf3 video_output: change the deinterlacing filter before displaying the picture
    9591771a6b video_output: allow changing the interlacing mode while locked
    3d0e4ebb14 video_output: get rid of the internal "deinterlace-needed" variable
    05acaa1e45 video_output: let the deinterlacing code access vout_thread_interlacing_t
    ebbbdf7d83 video_output: use a separate structure for the deinterlacing state
    14588c7d06 video_output: change the filters before checking for late frames
    d4c036a5f3 video_output: allow flushing filters without flusing the displayed.current
    3d13aad3b4 video_output: keep the displayed.current in frame by frame if next is not ready
    b7503cbfec video_output: move up a test on NULL displayed.current
    42011517f3 video_output: don't use displayed.next in frame by frame mode
    9eb231ed0d libvlc: set a name on the medialist seek thread
    d6f0a4215a modules: set names to threads created in modules
    2415cec16a core: set names to threads created in the core
    5bc16beec1 thread: add a function to give names to threads

Was it on purpose?

Regards