Skip to content

Commit f24a550

Browse files
committed
Squashed 'amf/public/' changes from 842cf83..fd860e8
fd860e8 Update shared code for AMF and TAN git-subtree-dir: amf/public git-subtree-split: fd860e804fedae72ed35a76d58e3576c7a6da3f9
1 parent 268bf0f commit f24a550

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+301
-81
lines changed

common/AMFFactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/AMFFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/AMFSTL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/AMFSTL.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/ByteArray.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/DataStream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/DataStreamFactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/DataStreamFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/DataStreamFile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

common/DataStreamMemory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// any Intellectual Property Rights relating to any standards, including but not
44
// limited to any audio and/or video codec technologies such as MPEG-2, MPEG-4;
55
// AVC/H.264; HEVC/H.265; AAC decode/FFMPEG; AAC encode/FFMPEG; VC-1; and MP3
6-
// (collectively, the Media Technologies). For clarity, you will pay any
6+
// (collectively, the "Media Technologies"). For clarity, you will pay any
77
// royalties due for such third party technologies, which may include the Media
88
// Technologies that are owed as a result of AMD providing the Software to you.
99
//

0 commit comments

Comments
 (0)