fixes after rebase and update integration test expectations to match …

…new output
shaka-project · Feb 15, 2024 · a97edc1 · a97edc1
1 parent e595c9b
commit a97edc1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/packager/app/test/testdata/hls-single-segment-ts/bear-640x360-audio.m3u8 b/packager/app/test/testdata/hls-single-segment-ts/bear-640x360-audio.m3u8
@@ -1,6 +1,6 @@
 #EXTM3U
 #EXT-X-VERSION:6
-## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXTINF:0.975,

diff --git a/packager/app/test/testdata/hls-single-segment-ts/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-ts/bear-640x360-video-iframe.m3u8
@@ -1,6 +1,6 @@
 #EXTM3U
 #EXT-X-VERSION:6
-## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY

diff --git a/packager/app/test/testdata/hls-single-segment-ts/bear-640x360-video.m3u8 b/packager/app/test/testdata/hls-single-segment-ts/bear-640x360-video.m3u8
@@ -1,6 +1,6 @@
 #EXTM3U
 #EXT-X-VERSION:6
-## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXTINF:1.001,

diff --git a/packager/app/test/testdata/hls-single-segment-ts/output.m3u8 b/packager/app/test/testdata/hls-single-segment-ts/output.m3u8
@@ -1,9 +1,9 @@
 #EXTM3U
-## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>
 
 #EXT-X-INDEPENDENT-SEGMENTS
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1217520,AVERAGE-BANDWIDTH=1117320,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8

diff --git a/packager/media/formats/mp2t/ts_muxer.cc b/packager/media/formats/mp2t/ts_muxer.cc
@@ -8,8 +8,8 @@
 
 #include <absl/log/check.h>
 
-#include "packager/media/base/muxer_util.h"
-#include "packager/status_macros.h"
+#include <packager/macros/status.h>
+#include <packager/media/base/muxer_util.h>
 
 namespace shaka {
 namespace media {