Commit 4037adea authored by Jean-Paul Saman's avatar Jean-Paul Saman

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
parents be874b18 1eddd923
......@@ -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
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:
--------------------------------
......
AC_INIT(libdvbpsi, 1.1.1)
AC_INIT(libdvbpsi, 1.1.2)
AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR(.auto)
......
......@@ -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.
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment