-
Rémi Denis-Courmont authored
Conflicts: modules/video_filter/extract.c modules/video_filter/marq.c projects/mozilla/control/npolibvlc.cpp src/control/video.c
7f124704
Conflicts: modules/video_filter/extract.c modules/video_filter/marq.c projects/mozilla/control/npolibvlc.cpp src/control/video.c
VideoLAN code repository instance