aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Paul Saman <jpsaman@videolan.org>2013-11-05 08:24:30 (GMT)
committerJean-Paul Saman <jpsaman@videolan.org>2013-11-05 08:24:30 (GMT)
commit4037adea3581059ec7e4253747192868198b6e6b (patch)
treeaa02c3ec1daf385ca4abddd72af74602f99f4890
parentbe874b18fa3cd3cff9d57318414d56df15c2d358 (diff)
parent1eddd923546d21a112ffc1c112aff0122cfc8b12 (diff)
Merge branch 'branch/1.1.0-bugfix' of git.m2x.eu:libdvbpsi
Merge back changes make on branch/1.1.0-bugfix and that where not applied yet to the master branch. Conflicts: NEWS bootstrap src/descriptors/dr_54.h
-rw-r--r--Makefile.am6
-rw-r--r--NEWS10
-rw-r--r--configure.ac2
-rw-r--r--doc/doxygen.cfg2
-rw-r--r--src/dvbpsi.h2
5 files changed, 16 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 5ecfb01..922713b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,3 +25,9 @@ changelog:
sed -e 's/^[^0-9]/ /' -e 's/^ *$$//' -e 's/^ \* / /g' | \
grep -v '^ \*$$' | uniq >| ChangeLog
+dist-checksum: $(DIST_TARGETS)
+ rm -f *.md5 *.sha256
+ for sum in '$(DIST_ARCHIVES)'; do \
+ md5sum $$sum > $$sum.md5 && \
+ sha256sum $$sum > $$sum.sha256; \
+ done
diff --git a/NEWS b/NEWS
index 344755d..7a7549b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,14 @@
+Changes between 1.1.2 and 2.0.0:
+--------------------------------
+ * Added new descriptors:
+ - 0x4c Time shifted service
+ - 0x53 CA system id
+
Changes between 1.1.1 and 1.1.2:
--------------------------------
* Various bugfixes for ATSC PSI tables
+ * dvbpsi_packet_push() bugfix
* Various bugfixes for dvbinfo
* Ignore invalid program pids (pid=0) inside PAT table (closes vlc ticket #9695)
@@ -11,9 +18,6 @@ Changes between 1.1.0 and 1.1.1:
* Various bugfixes (documentation, dvbinfo)
* Check TDT and TOT in dvbpsi_CheckPSISection() both have b_syntax_indicator set to '0'.
* Allow SDT with table_id 0x46
- * Added new descriptors:
- - 0x4c Time shifted service
- - 0x53 CA system id
Changes between 1.0.0 and 1.1.0:
--------------------------------
diff --git a/configure.ac b/configure.ac
index dcc4e97..1f3af90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(libdvbpsi, 1.1.1)
+AC_INIT(libdvbpsi, 1.1.2)
AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR(.auto)
diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
index f7eeb0e..639e8ba 100644
--- a/doc/doxygen.cfg
+++ b/doc/doxygen.cfg
@@ -31,7 +31,7 @@ PROJECT_NAME = libdvbpsi
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 1.1.1
+PROJECT_NUMBER = 1.1.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/dvbpsi.h b/src/dvbpsi.h
index 9675480..e0593ac 100644
--- a/src/dvbpsi.h
+++ b/src/dvbpsi.h
@@ -35,7 +35,7 @@
#ifndef _DVBPSI_DVBPSI_H_
#define _DVBPSI_DVBPSI_H_
-#define DVBPSI_VERSION 1.1.1 /*!< Human readible DVBPSI version*/
+#define DVBPSI_VERSION 1.1.2 /*!< Human readible DVBPSI version*/
#define DVBPSI_VERSION_INT ((1<<16)+(1<<8)+1) /*!< Machine readible DVBPSI version */
#ifdef __cplusplus

Privacy Policy