mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
configure: Fix merge mistake
This commit is contained in:
parent
7efecfc961
commit
81e6d94bb5
1 changed files with 0 additions and 3 deletions
|
@ -1641,11 +1641,8 @@ gst/frei0r/Makefile
|
||||||
gst/h264parse/Makefile
|
gst/h264parse/Makefile
|
||||||
gst/hdvparse/Makefile
|
gst/hdvparse/Makefile
|
||||||
gst/id3tag/Makefile
|
gst/id3tag/Makefile
|
||||||
<<<<<<< HEAD
|
|
||||||
gst/invtelecine/Makefile
|
gst/invtelecine/Makefile
|
||||||
=======
|
|
||||||
gst/imagefreeze/Makefile
|
gst/imagefreeze/Makefile
|
||||||
>>>>>>> imagefreeze: Add still frame stream generator element
|
|
||||||
gst/jpegformat/Makefile
|
gst/jpegformat/Makefile
|
||||||
gst/legacyresample/Makefile
|
gst/legacyresample/Makefile
|
||||||
gst/librfb/Makefile
|
gst/librfb/Makefile
|
||||||
|
|
Loading…
Reference in a new issue