Hi Mauro, Hans,

Pending an Ack from Hans de Goede, can you please pull from 
http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-lib for the following:

- libv4l2util: rename from libv4l2 to prevent clash with the libv4l2 
conversion library
- v4l2-apps: move libraries around to make the directory tree flatter
- v4l2-apps: rename v4l2_sysfs_path to v4l2-sysfs-path
- v4l2-apps: rename capture_example to capture-example
- v4l-dvb: fixup .hgignore

The conflict between these two libraries had to be resolved because I need 
to use both of them in the upcoming improved qv4l2.

And please, when someone adds a new tool give it a name that follows 
existing naming conventions!

Thanks,

        Hans

diffstat:
 .hgignore                                                 |   12
 a/v4l2-apps/lib/COPYING.LIB                               |  510 --
 a/v4l2-apps/lib/Makefile                                  |   33
 a/v4l2-apps/lib/TODO                                      |   81
 a/v4l2-apps/lib/frequencies.c                             | 1502 --------
 a/v4l2-apps/lib/libv4l/COPYING.LIB                        |  510 --
 a/v4l2-apps/lib/libv4l/ChangeLog                          |  247 -
 a/v4l2-apps/lib/libv4l/Makefile                           |   16
 a/v4l2-apps/lib/libv4l/README                             |  141
 a/v4l2-apps/lib/libv4l/README.multi-threading             |   12
 a/v4l2-apps/lib/libv4l/TODO                               |   12
 a/v4l2-apps/lib/libv4l/include/libv4l1.h                  |   73
 a/v4l2-apps/lib/libv4l/include/libv4l2.h                  |  110
 a/v4l2-apps/lib/libv4l/include/libv4lconvert.h            |   88
 a/v4l2-apps/lib/libv4l/libv4l1/Makefile                   |   83
 a/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h             |   83
 a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c                  |  837 ----
 a/v4l2-apps/lib/libv4l/libv4l1/log.c                      |  145
 a/v4l2-apps/lib/libv4l/libv4l1/v4l1compat.c               |  127
 a/v4l2-apps/lib/libv4l/libv4l2/Makefile                   |   82
 a/v4l2-apps/lib/libv4l/libv4l2/libv4l2-priv.h             |   95
 a/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c                  | 1145 ------
 a/v4l2-apps/lib/libv4l/libv4l2/log.c                      |  148
 a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c              |  166
 a/v4l2-apps/lib/libv4l/libv4lconvert/Makefile             |   70
 a/v4l2-apps/lib/libv4l/libv4lconvert/bayer.c              |  613 ---
 a/v4l2-apps/lib/libv4l/libv4lconvert/flip.c               |  107
 a/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c           |  286 -
 a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert-priv.h |  166
 a/v4l2-apps/lib/libv4l/libv4lconvert/libv4lconvert.c      |  737 ----
 a/v4l2-apps/lib/libv4l/libv4lconvert/pac207.c             |  418 --
 a/v4l2-apps/lib/libv4l/libv4lconvert/rgbyuv.c             |  316 -
 a/v4l2-apps/lib/libv4l/libv4lconvert/sn9c10x.c            |  287 -
 a/v4l2-apps/lib/libv4l/libv4lconvert/spca501.c            |  126
 a/v4l2-apps/lib/libv4l/libv4lconvert/spca561-decompress.c | 1003 -----
 a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg-internal.h  |  121
 a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.c           | 
2463 --------------
 a/v4l2-apps/lib/libv4l/libv4lconvert/tinyjpeg.h           |   74
 a/v4l2-apps/lib/libv4l2util.h                             |   45
 a/v4l2-apps/lib/v4l2.h                                    |   45
 a/v4l2-apps/lib/v4l2_driver.c                             |  804 ----
 a/v4l2-apps/lib/v4l2_driver.h                             |   81
 a/v4l2-apps/test/capture_example.c                        |  659 ---
 a/v4l2-apps/util/v4l2_sysfs_path.c                        |  191 -
 b/v4l2-apps/lib/libv4l2util.h                             |   45
 b/v4l2-apps/libv4l/COPYING.LIB                            |  510 ++
 b/v4l2-apps/libv4l/ChangeLog                              |  247 +
 b/v4l2-apps/libv4l/Makefile                               |   16
 b/v4l2-apps/libv4l/README                                 |  141
 b/v4l2-apps/libv4l/README.multi-threading                 |   12
 b/v4l2-apps/libv4l/TODO                                   |   12
 b/v4l2-apps/libv4l/include/libv4l1.h                      |   73
 b/v4l2-apps/libv4l/include/libv4l2.h                      |  110
 b/v4l2-apps/libv4l/include/libv4lconvert.h                |   88
 b/v4l2-apps/libv4l/libv4l1/Makefile                       |   83
 b/v4l2-apps/libv4l/libv4l1/libv4l1-priv.h                 |   83
 b/v4l2-apps/libv4l/libv4l1/libv4l1.c                      |  837 ++++
 b/v4l2-apps/libv4l/libv4l1/log.c                          |  145
 b/v4l2-apps/libv4l/libv4l1/v4l1compat.c                   |  127
 b/v4l2-apps/libv4l/libv4l2/Makefile                       |   82
 b/v4l2-apps/libv4l/libv4l2/libv4l2-priv.h                 |   95
 b/v4l2-apps/libv4l/libv4l2/libv4l2.c                      | 1145 ++++++
 b/v4l2-apps/libv4l/libv4l2/log.c                          |  148
 b/v4l2-apps/libv4l/libv4l2/v4l2convert.c                  |  166
 b/v4l2-apps/libv4l/libv4lconvert/Makefile                 |   70
 b/v4l2-apps/libv4l/libv4lconvert/bayer.c                  |  613 +++
 b/v4l2-apps/libv4l/libv4lconvert/flip.c                   |  107
 b/v4l2-apps/libv4l/libv4lconvert/jidctflt.c               |  286 +
 b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert-priv.h     |  166
 b/v4l2-apps/libv4l/libv4lconvert/libv4lconvert.c          |  737 ++++
 b/v4l2-apps/libv4l/libv4lconvert/pac207.c                 |  418 ++
 b/v4l2-apps/libv4l/libv4lconvert/rgbyuv.c                 |  316 +
 b/v4l2-apps/libv4l/libv4lconvert/sn9c10x.c                |  287 +
 b/v4l2-apps/libv4l/libv4lconvert/spca501.c                |  126
 b/v4l2-apps/libv4l/libv4lconvert/spca561-decompress.c     | 1003 +++++
 b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg-internal.h      |  121
 b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.c               | 2463 
++++++++++++++
 b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.h               |   74
 b/v4l2-apps/libv4l2util/COPYING.LIB                       |  510 ++
 b/v4l2-apps/libv4l2util/Makefile                          |   33
 b/v4l2-apps/libv4l2util/TODO                              |   81
 b/v4l2-apps/libv4l2util/frequencies.c                     | 1502 ++++++++
 b/v4l2-apps/libv4l2util/libv4l2util.h                     |   45
 b/v4l2-apps/libv4l2util/v4l2_driver.c                     |  804 ++++
 b/v4l2-apps/libv4l2util/v4l2_driver.h                     |   81
 b/v4l2-apps/test/capture-example.c                        |  657 +++
 b/v4l2-apps/util/v4l2-sysfs-path.c                        |  191 +
 v4l2-apps/Makefile                                        |    3
 v4l2-apps/lib/Makefile                                    |    6
 v4l2-apps/lib/frequencies.c                               |    2
 v4l2-apps/test/Makefile                                   |   14
 v4l2-apps/test/driver-test.c                              |    2
 v4l2-apps/util/Makefile                                   |   20
 v4l2-apps/util/qv4l2/ctrl-tab.cpp                         |    2
 v4l2-apps/util/qv4l2/general-tab.cpp                      |    2
 v4l2-apps/util/qv4l2/qv4l2.cpp                            |    2
 v4l2-apps/util/qv4l2/qv4l2.pro                            |    6
 v4l2-apps/util/v4l2_sysfs_path.c                          |    2
 v4l2-spec/Makefile                                        |    4
 99 files changed, 14897 insertions(+), 14894 deletions(-)

-- 
Hans Verkuil - video4linux developer - sponsored by TANDBERG
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to