diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog 2013-03-08 15:10:21.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/changelog 2013-05-16 20:37:28.000000000 +0000 @@ -1,4 +1,9 @@ -xbmc-pvr-addons (1.0.0~git20130308.1607-ed5ff3c-0~precise) precise; urgency=high +xbmc-pvr-addons (1.0.0~git20130516.2234-fb8d0d9-0~precise) precise; urgency=high + + + [Lars Op den Kamp] + * sync ffmpeg codec ids. closes #195 + diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/changelog.in --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in 2013-03-08 15:07:14.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/changelog.in 2013-05-16 20:34:29.000000000 +0000 @@ -1,4 +1,9 @@ -xbmc-pvr-addons (1.0.0~git20130308.1607-ed5ff3c-0~#DIST#) #DIST#; urgency=high +xbmc-pvr-addons (1.0.0~git20130516.2234-fb8d0d9-0~#DIST#) #DIST#; urgency=high + + + [Lars Op den Kamp] + * sync ffmpeg codec ids. closes #195 + diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/changelog.in.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/changelog.in.old 2013-03-08 15:07:04.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/changelog.in.old 2013-05-16 20:34:17.000000000 +0000 @@ -1,5 +1,10 @@ xbmc-pvr-addons (#PACKAGEVERSION#-0~#DIST#) #DIST#; urgency=high + [Lars Op den Kamp] + * sync ffmpeg codec ids. closes #195 + + + diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/vdr-plugin-vnsiserver.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog 2013-03-08 15:10:52.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/vdr-plugin-vnsiserver.changelog 2013-05-16 20:37:58.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1:0.9.1-2precise) precise; urgency=low +xbmc-pvr-addons (1:0.9.1-3precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:52 +0100 + -- wsnipex Thu, 16 May 2013 22:37:58 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/vdr-plugin-vnsiserver.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.changelog.old 2013-03-08 15:09:19.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/vdr-plugin-vnsiserver.changelog.old 2013-05-16 20:36:29.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1:0.9.1-2quantal) quantal; urgency=low +xbmc-pvr-addons (1:0.9.1-3quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:09:19 +0100 + -- wsnipex Thu, 16 May 2013 22:36:29 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/vdr-plugin-vnsiserver.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/vdr-plugin-vnsiserver.version 2013-03-08 15:10:49.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/vdr-plugin-vnsiserver.version 2013-05-16 20:37:56.000000000 +0000 @@ -1 +1 @@ -1:0.9.1-2precise +1:0.9.1-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/versiontag xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/versiontag --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/versiontag 2013-03-08 15:07:04.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/versiontag 2013-05-16 20:34:17.000000000 +0000 @@ -1 +1 @@ -2 +3 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-argustv.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog 2013-03-08 15:10:32.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-argustv.changelog 2013-05-16 20:37:39.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.165-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.165-3precise) precise; urgency=low * v0.0.1.133 (31-03-2012) - The add-on now sets the time a recording was last watched on the server v0.0.1.132 (20-03-2012) - Small fix @@ -59,4 +59,4 @@ tuning of live TV and live radio (tsbuffer only, no rtsp), basic EPG - Tested ForTheRecord Argus version: v1.5.0.3 - -- wsnipex Fri, 08 Mar 2013 16:10:32 +0100 + -- wsnipex Thu, 16 May 2013 22:37:39 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-argustv.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.changelog.old 2013-03-08 15:09:00.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-argustv.changelog.old 2013-05-16 20:36:10.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.165-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.165-3quantal) quantal; urgency=low * v0.0.1.133 (31-03-2012) - The add-on now sets the time a recording was last watched on the server v0.0.1.132 (20-03-2012) - Small fix @@ -59,4 +59,4 @@ tuning of live TV and live radio (tsbuffer only, no rtsp), basic EPG - Tested ForTheRecord Argus version: v1.5.0.3 - -- wsnipex Fri, 08 Mar 2013 16:09:00 +0100 + -- wsnipex Thu, 16 May 2013 22:36:10 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-argustv.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-argustv.version 2013-03-08 15:10:29.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-argustv.version 2013-05-16 20:37:36.000000000 +0000 @@ -1 +1 @@ -1.7.165-2precise +1.7.165-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-demo.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog 2013-03-08 15:10:49.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-demo.changelog 2013-05-16 20:37:56.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.1-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.1-3precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:49 +0100 + -- wsnipex Thu, 16 May 2013 22:37:56 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-demo.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.changelog.old 2013-03-08 15:09:17.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-demo.changelog.old 2013-05-16 20:36:26.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.1-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.1-3quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:09:17 +0100 + -- wsnipex Thu, 16 May 2013 22:36:26 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-demo.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-demo.version 2013-03-08 15:10:47.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-demo.version 2013-05-16 20:37:53.000000000 +0000 @@ -1 +1 @@ -1.7.1-2precise +1.7.1-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-dvbviewer.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog 2013-03-08 15:10:46.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-dvbviewer.changelog 2013-05-16 20:37:53.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.5-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.5-3precise) precise; urgency=low * 1.7.5 [updated] Bump after PVR API version bump 1.6.5 [updated] Language files from Transifex 1.6.4 [fixed] Use utf-8 encoding to @@ -35,4 +35,4 @@ [fixed] When the EPG is missing the description entry, the event entry is used instead. 0.1.0 First version. - -- wsnipex Fri, 08 Mar 2013 16:10:46 +0100 + -- wsnipex Thu, 16 May 2013 22:37:53 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-dvbviewer.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.changelog.old 2013-03-08 15:09:14.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-dvbviewer.changelog.old 2013-05-16 20:36:24.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.5-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.5-3quantal) quantal; urgency=low * 1.7.5 [updated] Bump after PVR API version bump 1.6.5 [updated] Language files from Transifex 1.6.4 [fixed] Use utf-8 encoding to @@ -35,4 +35,4 @@ [fixed] When the EPG is missing the description entry, the event entry is used instead. 0.1.0 First version. - -- wsnipex Fri, 08 Mar 2013 16:09:14 +0100 + -- wsnipex Thu, 16 May 2013 22:36:24 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-dvbviewer.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-dvbviewer.version 2013-03-08 15:10:44.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-dvbviewer.version 2013-05-16 20:37:50.000000000 +0000 @@ -1 +1 @@ -1.7.5-2precise +1.7.5-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mediaportal-tvserver.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog 2013-03-08 15:10:35.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mediaportal-tvserver.changelog 2013-05-16 20:37:42.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.8-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.8-3precise) precise; urgency=low * - Added: use channel icons from MediaPortal (Windows, localhost only) - Changed: switch from libPlatform + libTcpSocket to platform @@ -51,4 +51,4 @@ client should abort connection when the TVServerXBMC version is too old v1.1.0.60 - Fix PVR client destroy - -- wsnipex Fri, 08 Mar 2013 16:10:35 +0100 + -- wsnipex Thu, 16 May 2013 22:37:42 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mediaportal-tvserver.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.changelog.old 2013-03-08 15:09:02.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mediaportal-tvserver.changelog.old 2013-05-16 20:36:13.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.8-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.8-3quantal) quantal; urgency=low * - Added: use channel icons from MediaPortal (Windows, localhost only) - Changed: switch from libPlatform + libTcpSocket to platform @@ -51,4 +51,4 @@ client should abort connection when the TVServerXBMC version is too old v1.1.0.60 - Fix PVR client destroy - -- wsnipex Fri, 08 Mar 2013 16:09:02 +0100 + -- wsnipex Thu, 16 May 2013 22:36:13 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mediaportal-tvserver.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mediaportal-tvserver.version 2013-03-08 15:10:32.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mediaportal-tvserver.version 2013-05-16 20:37:39.000000000 +0000 @@ -1 +1 @@ -1.7.8-2precise +1.7.8-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mythtv-cmyth.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog 2013-03-08 15:10:43.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mythtv-cmyth.changelog 2013-05-16 20:37:50.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.10-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.10-3precise) precise; urgency=low * v1.7.10 - Get last played position for recordings from the server v1.7.9 - Provide EDLs if available (commercial skip data cut lists) @@ -41,4 +41,4 @@ - Supports setting / reading resume bookmarks and watched state on MythTV backend - -- wsnipex Fri, 08 Mar 2013 16:10:43 +0100 + -- wsnipex Thu, 16 May 2013 22:37:50 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mythtv-cmyth.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.changelog.old 2013-03-08 15:09:11.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mythtv-cmyth.changelog.old 2013-05-16 20:36:21.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.10-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.10-3quantal) quantal; urgency=low * v1.7.10 - Get last played position for recordings from the server v1.7.9 - Provide EDLs if available (commercial skip data cut lists) @@ -41,4 +41,4 @@ - Supports setting / reading resume bookmarks and watched state on MythTV backend - -- wsnipex Fri, 08 Mar 2013 16:09:11 +0100 + -- wsnipex Thu, 16 May 2013 22:36:21 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mythtv-cmyth.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-mythtv-cmyth.version 2013-03-08 15:10:41.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-mythtv-cmyth.version 2013-05-16 20:37:47.000000000 +0000 @@ -1 +1 @@ -1.7.10-2precise +1.7.10-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-nextpvr.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog 2013-03-08 15:10:29.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-nextpvr.changelog 2013-05-16 20:37:36.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.4-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.4-3precise) precise; urgency=low * v1.7.4 - Bump after PVR API version bump v1.6.4 - small change to improve the performance of radio channels v1.6.3 - updated language @@ -13,4 +13,4 @@ tuner was required for a recording. Shows user a notification message when this was required. v1.0.0.0 - Created - -- wsnipex Fri, 08 Mar 2013 16:10:29 +0100 + -- wsnipex Thu, 16 May 2013 22:37:36 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-nextpvr.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.changelog.old 2013-03-08 15:08:57.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-nextpvr.changelog.old 2013-05-16 20:36:07.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.4-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.4-3quantal) quantal; urgency=low * v1.7.4 - Bump after PVR API version bump v1.6.4 - small change to improve the performance of radio channels v1.6.3 - updated language @@ -13,4 +13,4 @@ tuner was required for a recording. Shows user a notification message when this was required. v1.0.0.0 - Created - -- wsnipex Fri, 08 Mar 2013 16:08:57 +0100 + -- wsnipex Thu, 16 May 2013 22:36:07 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-nextpvr.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-nextpvr.version 2013-03-08 15:10:26.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-nextpvr.version 2013-05-16 20:37:34.000000000 +0000 @@ -1 +1 @@ -1.7.4-2precise +1.7.4-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-njoy.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog 2013-03-08 15:10:41.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-njoy.changelog 2013-05-16 20:37:47.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.2-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.2-3precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:41 +0100 + -- wsnipex Thu, 16 May 2013 22:37:47 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-njoy.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.changelog.old 2013-03-08 15:09:08.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-njoy.changelog.old 2013-05-16 20:36:18.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.2-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.2-3quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:09:08 +0100 + -- wsnipex Thu, 16 May 2013 22:36:18 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-njoy.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-njoy.version 2013-03-08 15:10:38.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-njoy.version 2013-05-16 20:37:45.000000000 +0000 @@ -1 +1 @@ -1.7.2-2precise +1.7.2-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-tvheadend-hts.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog 2013-03-08 15:10:26.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-tvheadend-hts.changelog 2013-05-16 20:37:33.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.19-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.19-3precise) precise; urgency=low * - add timeshift skip support (FF/RW still not working) - fix bug in tvh webroot processing 1.6.18 - ensure channel count is not cleared @@ -32,4 +32,4 @@ removed unneeded member in CHTSPDemux - better handling of disconnect and reconnects 1.6.4 - initial release - -- wsnipex Fri, 08 Mar 2013 16:10:26 +0100 + -- wsnipex Thu, 16 May 2013 22:37:33 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-tvheadend-hts.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.changelog.old 2013-03-08 15:08:54.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-tvheadend-hts.changelog.old 2013-05-16 20:36:04.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.19-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.19-3quantal) quantal; urgency=low * - add timeshift skip support (FF/RW still not working) - fix bug in tvh webroot processing 1.6.18 - ensure channel count is not cleared @@ -32,4 +32,4 @@ removed unneeded member in CHTSPDemux - better handling of disconnect and reconnects 1.6.4 - initial release - -- wsnipex Fri, 08 Mar 2013 16:08:54 +0100 + -- wsnipex Thu, 16 May 2013 22:36:04 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-tvheadend-hts.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-tvheadend-hts.version 2013-03-08 15:10:24.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-tvheadend-hts.version 2013-05-16 20:37:31.000000000 +0000 @@ -1 +1 @@ -1.7.19-2precise +1.7.19-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vdr-vnsi.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog 2013-03-08 15:10:23.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vdr-vnsi.changelog 2013-05-16 20:37:31.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.4-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.4-3precise) precise; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:10:23 +0100 + -- wsnipex Thu, 16 May 2013 22:37:31 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vdr-vnsi.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.changelog.old 2013-03-08 15:08:51.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vdr-vnsi.changelog.old 2013-05-16 20:36:02.000000000 +0000 @@ -1,5 +1,5 @@ -xbmc-pvr-addons (1.7.4-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.4-3quantal) quantal; urgency=low * no upstream changelog available - -- wsnipex Fri, 08 Mar 2013 16:08:51 +0100 + -- wsnipex Thu, 16 May 2013 22:36:02 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vdr-vnsi.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vdr-vnsi.version 2013-03-08 15:10:21.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vdr-vnsi.version 2013-05-16 20:37:28.000000000 +0000 @@ -1 +1 @@ -1.7.4-2precise +1.7.4-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vuplus.changelog --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog 2013-03-08 15:10:38.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vuplus.changelog 2013-05-16 20:37:45.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.7-2precise) precise; urgency=low +xbmc-pvr-addons (1.7.7-3precise) precise; urgency=low * 0.2.4 - fix: put username & password into the streaming url 0.2.3 - fix: put username & password into recording-url 0.2.2: - fix: escape @@ -48,4 +48,4 @@ 0.1.1 - fix: URLEncode the service reference when fetching EPG 0.1.0 - Iniital Version - -- wsnipex Fri, 08 Mar 2013 16:10:38 +0100 + -- wsnipex Thu, 16 May 2013 22:37:45 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog.old xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vuplus.changelog.old --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.changelog.old 2013-03-08 15:09:05.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vuplus.changelog.old 2013-05-16 20:36:15.000000000 +0000 @@ -1,4 +1,4 @@ -xbmc-pvr-addons (1.7.7-2quantal) quantal; urgency=low +xbmc-pvr-addons (1.7.7-3quantal) quantal; urgency=low * 0.2.4 - fix: put username & password into the streaming url 0.2.3 - fix: put username & password into recording-url 0.2.2: - fix: escape @@ -48,4 +48,4 @@ 0.1.1 - fix: URLEncode the service reference when fetching EPG 0.1.0 - Iniital Version - -- wsnipex Fri, 08 Mar 2013 16:09:05 +0100 + -- wsnipex Thu, 16 May 2013 22:36:15 +0200 diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.version xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vuplus.version --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/debian/xbmc-pvr-vuplus.version 2013-03-08 15:10:35.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/debian/xbmc-pvr-vuplus.version 2013-05-16 20:37:42.000000000 +0000 @@ -1 +1 @@ -1.7.7-2precise +1.7.7-3precise diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/avcodec.h xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/xbmc/avcodec.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/avcodec.h 2012-11-15 21:18:19.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/xbmc/avcodec.h 2013-05-01 09:04:04.000000000 +0000 @@ -21,17 +21,17 @@ #ifndef AVCODEC_AVCODEC_H #define AVCODEC_AVCODEC_H -#define LIBAVCODEC_VERSION_MAJOR 53 -#define LIBAVCODEC_VERSION_MINOR 108 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MAJOR 54 +#define LIBAVCODEC_VERSION_MINOR 92 +#define LIBAVCODEC_VERSION_MICRO 100 enum AVMediaType { - AVMEDIA_TYPE_UNKNOWN = -1, + AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, - AVMEDIA_TYPE_DATA, + AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous AVMEDIA_TYPE_SUBTITLE, - AVMEDIA_TYPE_ATTACHMENT, + AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse AVMEDIA_TYPE_NB }; @@ -85,371 +85,417 @@ * If you add a codec ID to this list, add it so that * 1. no value of a existing codec ID changes (that would break ABI), * 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec. - * This ensures that 2 forks can independantly add CodecIDs without producing conflicts. + * This ensures that 2 forks can independently add AVCodecIDs without producing conflicts. + * + * After adding new codec IDs, do not forget to add an entry to the codec + * descriptor list and bump libavcodec minor version. */ -enum CodecID { - CODEC_ID_NONE, +enum AVCodecID { + AV_CODEC_ID_NONE, /* video codecs */ - CODEC_ID_MPEG1VIDEO, - CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding - CODEC_ID_MPEG2VIDEO_XVMC, - CODEC_ID_H261, - CODEC_ID_H263, - CODEC_ID_RV10, - CODEC_ID_RV20, - CODEC_ID_MJPEG, - CODEC_ID_MJPEGB, - CODEC_ID_LJPEG, - CODEC_ID_SP5X, - CODEC_ID_JPEGLS, - CODEC_ID_MPEG4, - CODEC_ID_RAWVIDEO, - CODEC_ID_MSMPEG4V1, - CODEC_ID_MSMPEG4V2, - CODEC_ID_MSMPEG4V3, - CODEC_ID_WMV1, - CODEC_ID_WMV2, - CODEC_ID_H263P, - CODEC_ID_H263I, - CODEC_ID_FLV1, - CODEC_ID_SVQ1, - CODEC_ID_SVQ3, - CODEC_ID_DVVIDEO, - CODEC_ID_HUFFYUV, - CODEC_ID_CYUV, - CODEC_ID_H264, - CODEC_ID_INDEO3, - CODEC_ID_VP3, - CODEC_ID_THEORA, - CODEC_ID_ASV1, - CODEC_ID_ASV2, - CODEC_ID_FFV1, - CODEC_ID_4XM, - CODEC_ID_VCR1, - CODEC_ID_CLJR, - CODEC_ID_MDEC, - CODEC_ID_ROQ, - CODEC_ID_INTERPLAY_VIDEO, - CODEC_ID_XAN_WC3, - CODEC_ID_XAN_WC4, - CODEC_ID_RPZA, - CODEC_ID_CINEPAK, - CODEC_ID_WS_VQA, - CODEC_ID_MSRLE, - CODEC_ID_MSVIDEO1, - CODEC_ID_IDCIN, - CODEC_ID_8BPS, - CODEC_ID_SMC, - CODEC_ID_FLIC, - CODEC_ID_TRUEMOTION1, - CODEC_ID_VMDVIDEO, - CODEC_ID_MSZH, - CODEC_ID_ZLIB, - CODEC_ID_QTRLE, - CODEC_ID_SNOW, - CODEC_ID_TSCC, - CODEC_ID_ULTI, - CODEC_ID_QDRAW, - CODEC_ID_VIXL, - CODEC_ID_QPEG, - CODEC_ID_PNG, - CODEC_ID_PPM, - CODEC_ID_PBM, - CODEC_ID_PGM, - CODEC_ID_PGMYUV, - CODEC_ID_PAM, - CODEC_ID_FFVHUFF, - CODEC_ID_RV30, - CODEC_ID_RV40, - CODEC_ID_VC1, - CODEC_ID_WMV3, - CODEC_ID_LOCO, - CODEC_ID_WNV1, - CODEC_ID_AASC, - CODEC_ID_INDEO2, - CODEC_ID_FRAPS, - CODEC_ID_TRUEMOTION2, - CODEC_ID_BMP, - CODEC_ID_CSCD, - CODEC_ID_MMVIDEO, - CODEC_ID_ZMBV, - CODEC_ID_AVS, - CODEC_ID_SMACKVIDEO, - CODEC_ID_NUV, - CODEC_ID_KMVC, - CODEC_ID_FLASHSV, - CODEC_ID_CAVS, - CODEC_ID_JPEG2000, - CODEC_ID_VMNC, - CODEC_ID_VP5, - CODEC_ID_VP6, - CODEC_ID_VP6F, - CODEC_ID_TARGA, - CODEC_ID_DSICINVIDEO, - CODEC_ID_TIERTEXSEQVIDEO, - CODEC_ID_TIFF, - CODEC_ID_GIF, -#if LIBAVCODEC_VERSION_MAJOR == 53 - CODEC_ID_FFH264, -#endif - CODEC_ID_DXA, - CODEC_ID_DNXHD, - CODEC_ID_THP, - CODEC_ID_SGI, - CODEC_ID_C93, - CODEC_ID_BETHSOFTVID, - CODEC_ID_PTX, - CODEC_ID_TXD, - CODEC_ID_VP6A, - CODEC_ID_AMV, - CODEC_ID_VB, - CODEC_ID_PCX, - CODEC_ID_SUNRAST, - CODEC_ID_INDEO4, - CODEC_ID_INDEO5, - CODEC_ID_MIMIC, - CODEC_ID_RL2, -#if LIBAVCODEC_VERSION_MAJOR == 53 - CODEC_ID_8SVX_EXP, - CODEC_ID_8SVX_FIB, -#endif - CODEC_ID_ESCAPE124, - CODEC_ID_DIRAC, - CODEC_ID_BFI, - CODEC_ID_CMV, - CODEC_ID_MOTIONPIXELS, - CODEC_ID_TGV, - CODEC_ID_TGQ, - CODEC_ID_TQI, - CODEC_ID_AURA, - CODEC_ID_AURA2, - CODEC_ID_V210X, - CODEC_ID_TMV, - CODEC_ID_V210, - CODEC_ID_DPX, - CODEC_ID_MAD, - CODEC_ID_FRWU, - CODEC_ID_FLASHSV2, - CODEC_ID_CDGRAPHICS, - CODEC_ID_R210, - CODEC_ID_ANM, - CODEC_ID_BINKVIDEO, - CODEC_ID_IFF_ILBM, - CODEC_ID_IFF_BYTERUN1, - CODEC_ID_KGV1, - CODEC_ID_YOP, - CODEC_ID_VP8, - CODEC_ID_PICTOR, - CODEC_ID_ANSI, - CODEC_ID_A64_MULTI, - CODEC_ID_A64_MULTI5, - CODEC_ID_R10K, - CODEC_ID_MXPEG, - CODEC_ID_LAGARITH, - CODEC_ID_PRORES, - CODEC_ID_JV, - CODEC_ID_DFA, - CODEC_ID_WMV3IMAGE, - CODEC_ID_VC1IMAGE, -#if LIBAVCODEC_VERSION_MAJOR == 53 - CODEC_ID_G723_1_DEPRECATED, - CODEC_ID_G729_DEPRECATED, -#endif - CODEC_ID_UTVIDEO_DEPRECATED, - CODEC_ID_BMV_VIDEO, - CODEC_ID_VBLE, - CODEC_ID_DXTORY, - CODEC_ID_V410, - CODEC_ID_XWD, - CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), - CODEC_ID_UTVIDEO = 0x800, - CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'), - CODEC_ID_AVRP = MKBETAG('A','V','R','P'), - - CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'), - CODEC_ID_V308 = MKBETAG('V','3','0','8'), - CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), + AV_CODEC_ID_MPEG1VIDEO, + AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding + AV_CODEC_ID_MPEG2VIDEO_XVMC, + AV_CODEC_ID_H261, + AV_CODEC_ID_H263, + AV_CODEC_ID_RV10, + AV_CODEC_ID_RV20, + AV_CODEC_ID_MJPEG, + AV_CODEC_ID_MJPEGB, + AV_CODEC_ID_LJPEG, + AV_CODEC_ID_SP5X, + AV_CODEC_ID_JPEGLS, + AV_CODEC_ID_MPEG4, + AV_CODEC_ID_RAWVIDEO, + AV_CODEC_ID_MSMPEG4V1, + AV_CODEC_ID_MSMPEG4V2, + AV_CODEC_ID_MSMPEG4V3, + AV_CODEC_ID_WMV1, + AV_CODEC_ID_WMV2, + AV_CODEC_ID_H263P, + AV_CODEC_ID_H263I, + AV_CODEC_ID_FLV1, + AV_CODEC_ID_SVQ1, + AV_CODEC_ID_SVQ3, + AV_CODEC_ID_DVVIDEO, + AV_CODEC_ID_HUFFYUV, + AV_CODEC_ID_CYUV, + AV_CODEC_ID_H264, + AV_CODEC_ID_INDEO3, + AV_CODEC_ID_VP3, + AV_CODEC_ID_THEORA, + AV_CODEC_ID_ASV1, + AV_CODEC_ID_ASV2, + AV_CODEC_ID_FFV1, + AV_CODEC_ID_4XM, + AV_CODEC_ID_VCR1, + AV_CODEC_ID_CLJR, + AV_CODEC_ID_MDEC, + AV_CODEC_ID_ROQ, + AV_CODEC_ID_INTERPLAY_VIDEO, + AV_CODEC_ID_XAN_WC3, + AV_CODEC_ID_XAN_WC4, + AV_CODEC_ID_RPZA, + AV_CODEC_ID_CINEPAK, + AV_CODEC_ID_WS_VQA, + AV_CODEC_ID_MSRLE, + AV_CODEC_ID_MSVIDEO1, + AV_CODEC_ID_IDCIN, + AV_CODEC_ID_8BPS, + AV_CODEC_ID_SMC, + AV_CODEC_ID_FLIC, + AV_CODEC_ID_TRUEMOTION1, + AV_CODEC_ID_VMDVIDEO, + AV_CODEC_ID_MSZH, + AV_CODEC_ID_ZLIB, + AV_CODEC_ID_QTRLE, + AV_CODEC_ID_SNOW, + AV_CODEC_ID_TSCC, + AV_CODEC_ID_ULTI, + AV_CODEC_ID_QDRAW, + AV_CODEC_ID_VIXL, + AV_CODEC_ID_QPEG, + AV_CODEC_ID_PNG, + AV_CODEC_ID_PPM, + AV_CODEC_ID_PBM, + AV_CODEC_ID_PGM, + AV_CODEC_ID_PGMYUV, + AV_CODEC_ID_PAM, + AV_CODEC_ID_FFVHUFF, + AV_CODEC_ID_RV30, + AV_CODEC_ID_RV40, + AV_CODEC_ID_VC1, + AV_CODEC_ID_WMV3, + AV_CODEC_ID_LOCO, + AV_CODEC_ID_WNV1, + AV_CODEC_ID_AASC, + AV_CODEC_ID_INDEO2, + AV_CODEC_ID_FRAPS, + AV_CODEC_ID_TRUEMOTION2, + AV_CODEC_ID_BMP, + AV_CODEC_ID_CSCD, + AV_CODEC_ID_MMVIDEO, + AV_CODEC_ID_ZMBV, + AV_CODEC_ID_AVS, + AV_CODEC_ID_SMACKVIDEO, + AV_CODEC_ID_NUV, + AV_CODEC_ID_KMVC, + AV_CODEC_ID_FLASHSV, + AV_CODEC_ID_CAVS, + AV_CODEC_ID_JPEG2000, + AV_CODEC_ID_VMNC, + AV_CODEC_ID_VP5, + AV_CODEC_ID_VP6, + AV_CODEC_ID_VP6F, + AV_CODEC_ID_TARGA, + AV_CODEC_ID_DSICINVIDEO, + AV_CODEC_ID_TIERTEXSEQVIDEO, + AV_CODEC_ID_TIFF, + AV_CODEC_ID_GIF, + AV_CODEC_ID_DXA, + AV_CODEC_ID_DNXHD, + AV_CODEC_ID_THP, + AV_CODEC_ID_SGI, + AV_CODEC_ID_C93, + AV_CODEC_ID_BETHSOFTVID, + AV_CODEC_ID_PTX, + AV_CODEC_ID_TXD, + AV_CODEC_ID_VP6A, + AV_CODEC_ID_AMV, + AV_CODEC_ID_VB, + AV_CODEC_ID_PCX, + AV_CODEC_ID_SUNRAST, + AV_CODEC_ID_INDEO4, + AV_CODEC_ID_INDEO5, + AV_CODEC_ID_MIMIC, + AV_CODEC_ID_RL2, + AV_CODEC_ID_ESCAPE124, + AV_CODEC_ID_DIRAC, + AV_CODEC_ID_BFI, + AV_CODEC_ID_CMV, + AV_CODEC_ID_MOTIONPIXELS, + AV_CODEC_ID_TGV, + AV_CODEC_ID_TGQ, + AV_CODEC_ID_TQI, + AV_CODEC_ID_AURA, + AV_CODEC_ID_AURA2, + AV_CODEC_ID_V210X, + AV_CODEC_ID_TMV, + AV_CODEC_ID_V210, + AV_CODEC_ID_DPX, + AV_CODEC_ID_MAD, + AV_CODEC_ID_FRWU, + AV_CODEC_ID_FLASHSV2, + AV_CODEC_ID_CDGRAPHICS, + AV_CODEC_ID_R210, + AV_CODEC_ID_ANM, + AV_CODEC_ID_BINKVIDEO, + AV_CODEC_ID_IFF_ILBM, + AV_CODEC_ID_IFF_BYTERUN1, + AV_CODEC_ID_KGV1, + AV_CODEC_ID_YOP, + AV_CODEC_ID_VP8, + AV_CODEC_ID_PICTOR, + AV_CODEC_ID_ANSI, + AV_CODEC_ID_A64_MULTI, + AV_CODEC_ID_A64_MULTI5, + AV_CODEC_ID_R10K, + AV_CODEC_ID_MXPEG, + AV_CODEC_ID_LAGARITH, + AV_CODEC_ID_PRORES, + AV_CODEC_ID_JV, + AV_CODEC_ID_DFA, + AV_CODEC_ID_WMV3IMAGE, + AV_CODEC_ID_VC1IMAGE, + AV_CODEC_ID_UTVIDEO, + AV_CODEC_ID_BMV_VIDEO, + AV_CODEC_ID_VBLE, + AV_CODEC_ID_DXTORY, + AV_CODEC_ID_V410, + AV_CODEC_ID_XWD, + AV_CODEC_ID_CDXL, + AV_CODEC_ID_XBM, + AV_CODEC_ID_ZEROCODEC, + AV_CODEC_ID_MSS1, + AV_CODEC_ID_MSA1, + AV_CODEC_ID_TSCC2, + AV_CODEC_ID_MTS2, + AV_CODEC_ID_CLLC, + AV_CODEC_ID_MSS2, + AV_CODEC_ID_VP9, + AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), + AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), + AV_CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'), + AV_CODEC_ID_EXR = MKBETAG('0','E','X','R'), + AV_CODEC_ID_AVRP = MKBETAG('A','V','R','P'), + + AV_CODEC_ID_012V = MKBETAG('0','1','2','V'), + AV_CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'), + AV_CODEC_ID_AVUI = MKBETAG('A','V','U','I'), + AV_CODEC_ID_AYUV = MKBETAG('A','Y','U','V'), + AV_CODEC_ID_TARGA_Y216 = MKBETAG('T','2','1','6'), + AV_CODEC_ID_V308 = MKBETAG('V','3','0','8'), + AV_CODEC_ID_V408 = MKBETAG('V','4','0','8'), + AV_CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), + AV_CODEC_ID_SANM = MKBETAG('S','A','N','M'), + AV_CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'), + AV_CODEC_ID_AVRN = MKBETAG('A','V','R','n'), + AV_CODEC_ID_CPIA = MKBETAG('C','P','I','A'), + AV_CODEC_ID_XFACE = MKBETAG('X','F','A','C'), + AV_CODEC_ID_SGIRLE = MKBETAG('S','G','I','R'), + AV_CODEC_ID_MVC1 = MKBETAG('M','V','C','1'), + AV_CODEC_ID_MVC2 = MKBETAG('M','V','C','2'), /* various PCM "codecs" */ - CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs - CODEC_ID_PCM_S16LE = 0x10000, - CODEC_ID_PCM_S16BE, - CODEC_ID_PCM_U16LE, - CODEC_ID_PCM_U16BE, - CODEC_ID_PCM_S8, - CODEC_ID_PCM_U8, - CODEC_ID_PCM_MULAW, - CODEC_ID_PCM_ALAW, - CODEC_ID_PCM_S32LE, - CODEC_ID_PCM_S32BE, - CODEC_ID_PCM_U32LE, - CODEC_ID_PCM_U32BE, - CODEC_ID_PCM_S24LE, - CODEC_ID_PCM_S24BE, - CODEC_ID_PCM_U24LE, - CODEC_ID_PCM_U24BE, - CODEC_ID_PCM_S24DAUD, - CODEC_ID_PCM_ZORK, - CODEC_ID_PCM_S16LE_PLANAR, - CODEC_ID_PCM_DVD, - CODEC_ID_PCM_F32BE, - CODEC_ID_PCM_F32LE, - CODEC_ID_PCM_F64BE, - CODEC_ID_PCM_F64LE, - CODEC_ID_PCM_BLURAY, - CODEC_ID_PCM_LXF, - CODEC_ID_S302M, - CODEC_ID_PCM_S8_PLANAR, + AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs + AV_CODEC_ID_PCM_S16LE = 0x10000, + AV_CODEC_ID_PCM_S16BE, + AV_CODEC_ID_PCM_U16LE, + AV_CODEC_ID_PCM_U16BE, + AV_CODEC_ID_PCM_S8, + AV_CODEC_ID_PCM_U8, + AV_CODEC_ID_PCM_MULAW, + AV_CODEC_ID_PCM_ALAW, + AV_CODEC_ID_PCM_S32LE, + AV_CODEC_ID_PCM_S32BE, + AV_CODEC_ID_PCM_U32LE, + AV_CODEC_ID_PCM_U32BE, + AV_CODEC_ID_PCM_S24LE, + AV_CODEC_ID_PCM_S24BE, + AV_CODEC_ID_PCM_U24LE, + AV_CODEC_ID_PCM_U24BE, + AV_CODEC_ID_PCM_S24DAUD, + AV_CODEC_ID_PCM_ZORK, + AV_CODEC_ID_PCM_S16LE_PLANAR, + AV_CODEC_ID_PCM_DVD, + AV_CODEC_ID_PCM_F32BE, + AV_CODEC_ID_PCM_F32LE, + AV_CODEC_ID_PCM_F64BE, + AV_CODEC_ID_PCM_F64LE, + AV_CODEC_ID_PCM_BLURAY, + AV_CODEC_ID_PCM_LXF, + AV_CODEC_ID_S302M, + AV_CODEC_ID_PCM_S8_PLANAR, + AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'), + AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'), + AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16), /* various ADPCM codecs */ - CODEC_ID_ADPCM_IMA_QT = 0x11000, - CODEC_ID_ADPCM_IMA_WAV, - CODEC_ID_ADPCM_IMA_DK3, - CODEC_ID_ADPCM_IMA_DK4, - CODEC_ID_ADPCM_IMA_WS, - CODEC_ID_ADPCM_IMA_SMJPEG, - CODEC_ID_ADPCM_MS, - CODEC_ID_ADPCM_4XM, - CODEC_ID_ADPCM_XA, - CODEC_ID_ADPCM_ADX, - CODEC_ID_ADPCM_EA, - CODEC_ID_ADPCM_G726, - CODEC_ID_ADPCM_CT, - CODEC_ID_ADPCM_SWF, - CODEC_ID_ADPCM_YAMAHA, - CODEC_ID_ADPCM_SBPRO_4, - CODEC_ID_ADPCM_SBPRO_3, - CODEC_ID_ADPCM_SBPRO_2, - CODEC_ID_ADPCM_THP, - CODEC_ID_ADPCM_IMA_AMV, - CODEC_ID_ADPCM_EA_R1, - CODEC_ID_ADPCM_EA_R3, - CODEC_ID_ADPCM_EA_R2, - CODEC_ID_ADPCM_IMA_EA_SEAD, - CODEC_ID_ADPCM_IMA_EA_EACS, - CODEC_ID_ADPCM_EA_XAS, - CODEC_ID_ADPCM_EA_MAXIS_XA, - CODEC_ID_ADPCM_IMA_ISS, - CODEC_ID_ADPCM_G722, - CODEC_ID_ADPCM_IMA_APC, + AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, + AV_CODEC_ID_ADPCM_IMA_WAV, + AV_CODEC_ID_ADPCM_IMA_DK3, + AV_CODEC_ID_ADPCM_IMA_DK4, + AV_CODEC_ID_ADPCM_IMA_WS, + AV_CODEC_ID_ADPCM_IMA_SMJPEG, + AV_CODEC_ID_ADPCM_MS, + AV_CODEC_ID_ADPCM_4XM, + AV_CODEC_ID_ADPCM_XA, + AV_CODEC_ID_ADPCM_ADX, + AV_CODEC_ID_ADPCM_EA, + AV_CODEC_ID_ADPCM_G726, + AV_CODEC_ID_ADPCM_CT, + AV_CODEC_ID_ADPCM_SWF, + AV_CODEC_ID_ADPCM_YAMAHA, + AV_CODEC_ID_ADPCM_SBPRO_4, + AV_CODEC_ID_ADPCM_SBPRO_3, + AV_CODEC_ID_ADPCM_SBPRO_2, + AV_CODEC_ID_ADPCM_THP, + AV_CODEC_ID_ADPCM_IMA_AMV, + AV_CODEC_ID_ADPCM_EA_R1, + AV_CODEC_ID_ADPCM_EA_R3, + AV_CODEC_ID_ADPCM_EA_R2, + AV_CODEC_ID_ADPCM_IMA_EA_SEAD, + AV_CODEC_ID_ADPCM_IMA_EA_EACS, + AV_CODEC_ID_ADPCM_EA_XAS, + AV_CODEC_ID_ADPCM_EA_MAXIS_XA, + AV_CODEC_ID_ADPCM_IMA_ISS, + AV_CODEC_ID_ADPCM_G722, + AV_CODEC_ID_ADPCM_IMA_APC, + AV_CODEC_ID_VIMA = MKBETAG('V','I','M','A'), + AV_CODEC_ID_ADPCM_AFC = MKBETAG('A','F','C',' '), + AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '), /* AMR */ - CODEC_ID_AMR_NB = 0x12000, - CODEC_ID_AMR_WB, + AV_CODEC_ID_AMR_NB = 0x12000, + AV_CODEC_ID_AMR_WB, /* RealAudio codecs*/ - CODEC_ID_RA_144 = 0x13000, - CODEC_ID_RA_288, + AV_CODEC_ID_RA_144 = 0x13000, + AV_CODEC_ID_RA_288, /* various DPCM codecs */ - CODEC_ID_ROQ_DPCM = 0x14000, - CODEC_ID_INTERPLAY_DPCM, - CODEC_ID_XAN_DPCM, - CODEC_ID_SOL_DPCM, + AV_CODEC_ID_ROQ_DPCM = 0x14000, + AV_CODEC_ID_INTERPLAY_DPCM, + AV_CODEC_ID_XAN_DPCM, + AV_CODEC_ID_SOL_DPCM, /* audio codecs */ - CODEC_ID_MP2 = 0x15000, - CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 - CODEC_ID_AAC, - CODEC_ID_AC3, - CODEC_ID_DTS, - CODEC_ID_VORBIS, - CODEC_ID_DVAUDIO, - CODEC_ID_WMAV1, - CODEC_ID_WMAV2, - CODEC_ID_MACE3, - CODEC_ID_MACE6, - CODEC_ID_VMDAUDIO, -#if LIBAVCODEC_VERSION_MAJOR == 53 - CODEC_ID_SONIC, - CODEC_ID_SONIC_LS, + AV_CODEC_ID_MP2 = 0x15000, + AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 + AV_CODEC_ID_AAC, + AV_CODEC_ID_AC3, + AV_CODEC_ID_DTS, + AV_CODEC_ID_VORBIS, + AV_CODEC_ID_DVAUDIO, + AV_CODEC_ID_WMAV1, + AV_CODEC_ID_WMAV2, + AV_CODEC_ID_MACE3, + AV_CODEC_ID_MACE6, + AV_CODEC_ID_VMDAUDIO, + AV_CODEC_ID_FLAC, + AV_CODEC_ID_MP3ADU, + AV_CODEC_ID_MP3ON4, + AV_CODEC_ID_SHORTEN, + AV_CODEC_ID_ALAC, + AV_CODEC_ID_WESTWOOD_SND1, + AV_CODEC_ID_GSM, ///< as in Berlin toast format + AV_CODEC_ID_QDM2, + AV_CODEC_ID_COOK, + AV_CODEC_ID_TRUESPEECH, + AV_CODEC_ID_TTA, + AV_CODEC_ID_SMACKAUDIO, + AV_CODEC_ID_QCELP, + AV_CODEC_ID_WAVPACK, + AV_CODEC_ID_DSICINAUDIO, + AV_CODEC_ID_IMC, + AV_CODEC_ID_MUSEPACK7, + AV_CODEC_ID_MLP, + AV_CODEC_ID_GSM_MS, /* as found in WAV */ + AV_CODEC_ID_ATRAC3, + AV_CODEC_ID_VOXWARE, + AV_CODEC_ID_APE, + AV_CODEC_ID_NELLYMOSER, + AV_CODEC_ID_MUSEPACK8, + AV_CODEC_ID_SPEEX, + AV_CODEC_ID_WMAVOICE, + AV_CODEC_ID_WMAPRO, + AV_CODEC_ID_WMALOSSLESS, + AV_CODEC_ID_ATRAC3P, + AV_CODEC_ID_EAC3, + AV_CODEC_ID_SIPR, + AV_CODEC_ID_MP1, + AV_CODEC_ID_TWINVQ, + AV_CODEC_ID_TRUEHD, + AV_CODEC_ID_MP4ALS, + AV_CODEC_ID_ATRAC1, + AV_CODEC_ID_BINKAUDIO_RDFT, + AV_CODEC_ID_BINKAUDIO_DCT, + AV_CODEC_ID_AAC_LATM, + AV_CODEC_ID_QDMC, + AV_CODEC_ID_CELT, + AV_CODEC_ID_G723_1, + AV_CODEC_ID_G729, + AV_CODEC_ID_8SVX_EXP, + AV_CODEC_ID_8SVX_FIB, + AV_CODEC_ID_BMV_AUDIO, + AV_CODEC_ID_RALF, + AV_CODEC_ID_IAC, + AV_CODEC_ID_ILBC, + AV_CODEC_ID_OPUS_DEPRECATED, + AV_CODEC_ID_COMFORT_NOISE, + AV_CODEC_ID_TAK_DEPRECATED, + AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'), +#if LIBAVCODEC_VERSION_MAJOR <= 54 + AV_CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'), #endif - CODEC_ID_FLAC, - CODEC_ID_MP3ADU, - CODEC_ID_MP3ON4, - CODEC_ID_SHORTEN, - CODEC_ID_ALAC, - CODEC_ID_WESTWOOD_SND1, - CODEC_ID_GSM, ///< as in Berlin toast format - CODEC_ID_QDM2, - CODEC_ID_COOK, - CODEC_ID_TRUESPEECH, - CODEC_ID_TTA, - CODEC_ID_SMACKAUDIO, - CODEC_ID_QCELP, - CODEC_ID_WAVPACK, - CODEC_ID_DSICINAUDIO, - CODEC_ID_IMC, - CODEC_ID_MUSEPACK7, - CODEC_ID_MLP, - CODEC_ID_GSM_MS, /* as found in WAV */ - CODEC_ID_ATRAC3, - CODEC_ID_VOXWARE, - CODEC_ID_APE, - CODEC_ID_NELLYMOSER, - CODEC_ID_MUSEPACK8, - CODEC_ID_SPEEX, - CODEC_ID_WMAVOICE, - CODEC_ID_WMAPRO, - CODEC_ID_WMALOSSLESS, - CODEC_ID_ATRAC3P, - CODEC_ID_EAC3, - CODEC_ID_SIPR, - CODEC_ID_MP1, - CODEC_ID_TWINVQ, - CODEC_ID_TRUEHD, - CODEC_ID_MP4ALS, - CODEC_ID_ATRAC1, - CODEC_ID_BINKAUDIO_RDFT, - CODEC_ID_BINKAUDIO_DCT, - CODEC_ID_AAC_LATM, - CODEC_ID_QDMC, - CODEC_ID_CELT, -#if LIBAVCODEC_VERSION_MAJOR > 53 - CODEC_ID_G723_1_DEPRECATED, - CODEC_ID_G729_DEPRECATED, - CODEC_ID_8SVX_EXP, - CODEC_ID_8SVX_FIB, -#endif - CODEC_ID_BMV_AUDIO, - CODEC_ID_G729 = 0x15800, - CODEC_ID_G723_1= 0x15801, - CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'), - CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'), + AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'), + AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'), + AV_CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'), + AV_CODEC_ID_OPUS = MKBETAG('O','P','U','S'), + AV_CODEC_ID_TAK = MKBETAG('t','B','a','K'), + AV_CODEC_ID_EVRC = MKBETAG('s','e','v','c'), + AV_CODEC_ID_SMV = MKBETAG('s','s','m','v'), /* subtitle codecs */ - CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. - CODEC_ID_DVD_SUBTITLE = 0x17000, - CODEC_ID_DVB_SUBTITLE, - CODEC_ID_TEXT, ///< raw UTF-8 text - CODEC_ID_XSUB, - CODEC_ID_SSA, - CODEC_ID_MOV_TEXT, - CODEC_ID_HDMV_PGS_SUBTITLE, - CODEC_ID_DVB_TELETEXT, - CODEC_ID_SRT, - CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'), + AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. + AV_CODEC_ID_DVD_SUBTITLE = 0x17000, + AV_CODEC_ID_DVB_SUBTITLE, + AV_CODEC_ID_TEXT, ///< raw UTF-8 text + AV_CODEC_ID_XSUB, + AV_CODEC_ID_SSA, + AV_CODEC_ID_MOV_TEXT, + AV_CODEC_ID_HDMV_PGS_SUBTITLE, + AV_CODEC_ID_DVB_TELETEXT, + AV_CODEC_ID_SRT, + AV_CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'), + AV_CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'), + AV_CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'), + AV_CODEC_ID_SAMI = MKBETAG('S','A','M','I'), + AV_CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'), + AV_CODEC_ID_SUBVIEWER1 = MKBETAG('S','b','V','1'), + AV_CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'), + AV_CODEC_ID_SUBRIP = MKBETAG('S','R','i','p'), + AV_CODEC_ID_WEBVTT = MKBETAG('W','V','T','T'), + AV_CODEC_ID_MPL2 = MKBETAG('M','P','L','2'), + AV_CODEC_ID_VPLAYER = MKBETAG('V','P','l','r'), + AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'), /* data codecs */ - CODEC_ID_VBI_DATA= 0x17500, - CODEC_ID_VBI_TELETEXT, + AV_CODEC_ID_VBI_DATA= 0x17500, + AV_CODEC_ID_VBI_TELETEXT, /* other specific kind of codecs (generally used for attachments) */ - CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. - CODEC_ID_TTF = 0x18000, - CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'), - CODEC_ID_XBIN = MKBETAG('X','B','I','N'), - CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), + AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. + AV_CODEC_ID_TTF = 0x18000, + AV_CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'), + AV_CODEC_ID_XBIN = MKBETAG('X','B','I','N'), + AV_CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), + AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'), + AV_CODEC_ID_SMPTE_KLV = MKBETAG('K','L','V','A'), - CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it + AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it - CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS + AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS * stream (only used by libavformat) */ - CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems + AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems * stream (only used by libavformat) */ - CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. + AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. + +#include "old_codec_ids.h" }; +#define CodecID AVCodecID + #endif diff -Nru xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/old_codec_ids.h xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/xbmc/old_codec_ids.h --- xbmc-pvr-addons-1.0.0~git20130308.1607-ed5ff3c/xbmc/old_codec_ids.h 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-pvr-addons-1.0.0~git20130516.2234-fb8d0d9/xbmc/old_codec_ids.h 2013-05-01 09:04:04.000000000 +0000 @@ -0,0 +1,396 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_OLD_CODEC_IDS_H +#define AVCODEC_OLD_CODEC_IDS_H + +/* + * This header exists to prevent new codec IDs from being accidentally added to + * the deprecated list. + * Do not include it directly. It will be removed on next major bump + * + * Do not add new items to this list. Use the AVCodecID enum instead. + */ + + CODEC_ID_NONE = AV_CODEC_ID_NONE, + + /* video codecs */ + CODEC_ID_MPEG1VIDEO, + CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding + CODEC_ID_MPEG2VIDEO_XVMC, + CODEC_ID_H261, + CODEC_ID_H263, + CODEC_ID_RV10, + CODEC_ID_RV20, + CODEC_ID_MJPEG, + CODEC_ID_MJPEGB, + CODEC_ID_LJPEG, + CODEC_ID_SP5X, + CODEC_ID_JPEGLS, + CODEC_ID_MPEG4, + CODEC_ID_RAWVIDEO, + CODEC_ID_MSMPEG4V1, + CODEC_ID_MSMPEG4V2, + CODEC_ID_MSMPEG4V3, + CODEC_ID_WMV1, + CODEC_ID_WMV2, + CODEC_ID_H263P, + CODEC_ID_H263I, + CODEC_ID_FLV1, + CODEC_ID_SVQ1, + CODEC_ID_SVQ3, + CODEC_ID_DVVIDEO, + CODEC_ID_HUFFYUV, + CODEC_ID_CYUV, + CODEC_ID_H264, + CODEC_ID_INDEO3, + CODEC_ID_VP3, + CODEC_ID_THEORA, + CODEC_ID_ASV1, + CODEC_ID_ASV2, + CODEC_ID_FFV1, + CODEC_ID_4XM, + CODEC_ID_VCR1, + CODEC_ID_CLJR, + CODEC_ID_MDEC, + CODEC_ID_ROQ, + CODEC_ID_INTERPLAY_VIDEO, + CODEC_ID_XAN_WC3, + CODEC_ID_XAN_WC4, + CODEC_ID_RPZA, + CODEC_ID_CINEPAK, + CODEC_ID_WS_VQA, + CODEC_ID_MSRLE, + CODEC_ID_MSVIDEO1, + CODEC_ID_IDCIN, + CODEC_ID_8BPS, + CODEC_ID_SMC, + CODEC_ID_FLIC, + CODEC_ID_TRUEMOTION1, + CODEC_ID_VMDVIDEO, + CODEC_ID_MSZH, + CODEC_ID_ZLIB, + CODEC_ID_QTRLE, + CODEC_ID_SNOW, + CODEC_ID_TSCC, + CODEC_ID_ULTI, + CODEC_ID_QDRAW, + CODEC_ID_VIXL, + CODEC_ID_QPEG, + CODEC_ID_PNG, + CODEC_ID_PPM, + CODEC_ID_PBM, + CODEC_ID_PGM, + CODEC_ID_PGMYUV, + CODEC_ID_PAM, + CODEC_ID_FFVHUFF, + CODEC_ID_RV30, + CODEC_ID_RV40, + CODEC_ID_VC1, + CODEC_ID_WMV3, + CODEC_ID_LOCO, + CODEC_ID_WNV1, + CODEC_ID_AASC, + CODEC_ID_INDEO2, + CODEC_ID_FRAPS, + CODEC_ID_TRUEMOTION2, + CODEC_ID_BMP, + CODEC_ID_CSCD, + CODEC_ID_MMVIDEO, + CODEC_ID_ZMBV, + CODEC_ID_AVS, + CODEC_ID_SMACKVIDEO, + CODEC_ID_NUV, + CODEC_ID_KMVC, + CODEC_ID_FLASHSV, + CODEC_ID_CAVS, + CODEC_ID_JPEG2000, + CODEC_ID_VMNC, + CODEC_ID_VP5, + CODEC_ID_VP6, + CODEC_ID_VP6F, + CODEC_ID_TARGA, + CODEC_ID_DSICINVIDEO, + CODEC_ID_TIERTEXSEQVIDEO, + CODEC_ID_TIFF, + CODEC_ID_GIF, + CODEC_ID_DXA, + CODEC_ID_DNXHD, + CODEC_ID_THP, + CODEC_ID_SGI, + CODEC_ID_C93, + CODEC_ID_BETHSOFTVID, + CODEC_ID_PTX, + CODEC_ID_TXD, + CODEC_ID_VP6A, + CODEC_ID_AMV, + CODEC_ID_VB, + CODEC_ID_PCX, + CODEC_ID_SUNRAST, + CODEC_ID_INDEO4, + CODEC_ID_INDEO5, + CODEC_ID_MIMIC, + CODEC_ID_RL2, + CODEC_ID_ESCAPE124, + CODEC_ID_DIRAC, + CODEC_ID_BFI, + CODEC_ID_CMV, + CODEC_ID_MOTIONPIXELS, + CODEC_ID_TGV, + CODEC_ID_TGQ, + CODEC_ID_TQI, + CODEC_ID_AURA, + CODEC_ID_AURA2, + CODEC_ID_V210X, + CODEC_ID_TMV, + CODEC_ID_V210, + CODEC_ID_DPX, + CODEC_ID_MAD, + CODEC_ID_FRWU, + CODEC_ID_FLASHSV2, + CODEC_ID_CDGRAPHICS, + CODEC_ID_R210, + CODEC_ID_ANM, + CODEC_ID_BINKVIDEO, + CODEC_ID_IFF_ILBM, + CODEC_ID_IFF_BYTERUN1, + CODEC_ID_KGV1, + CODEC_ID_YOP, + CODEC_ID_VP8, + CODEC_ID_PICTOR, + CODEC_ID_ANSI, + CODEC_ID_A64_MULTI, + CODEC_ID_A64_MULTI5, + CODEC_ID_R10K, + CODEC_ID_MXPEG, + CODEC_ID_LAGARITH, + CODEC_ID_PRORES, + CODEC_ID_JV, + CODEC_ID_DFA, + CODEC_ID_WMV3IMAGE, + CODEC_ID_VC1IMAGE, + CODEC_ID_UTVIDEO, + CODEC_ID_BMV_VIDEO, + CODEC_ID_VBLE, + CODEC_ID_DXTORY, + CODEC_ID_V410, + CODEC_ID_XWD, + CODEC_ID_CDXL, + CODEC_ID_XBM, + CODEC_ID_ZEROCODEC, + CODEC_ID_MSS1, + CODEC_ID_MSA1, + CODEC_ID_TSCC2, + CODEC_ID_MTS2, + CODEC_ID_CLLC, + CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), + CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'), + CODEC_ID_EXR = MKBETAG('0','E','X','R'), + CODEC_ID_AVRP = MKBETAG('A','V','R','P'), + + CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'), + CODEC_ID_AVUI = MKBETAG('A','V','U','I'), + CODEC_ID_AYUV = MKBETAG('A','Y','U','V'), + CODEC_ID_V308 = MKBETAG('V','3','0','8'), + CODEC_ID_V408 = MKBETAG('V','4','0','8'), + CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), + CODEC_ID_SANM = MKBETAG('S','A','N','M'), + CODEC_ID_PAF_VIDEO = MKBETAG('P','A','F','V'), + + /* various PCM "codecs" */ + CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs + CODEC_ID_PCM_S16LE = 0x10000, + CODEC_ID_PCM_S16BE, + CODEC_ID_PCM_U16LE, + CODEC_ID_PCM_U16BE, + CODEC_ID_PCM_S8, + CODEC_ID_PCM_U8, + CODEC_ID_PCM_MULAW, + CODEC_ID_PCM_ALAW, + CODEC_ID_PCM_S32LE, + CODEC_ID_PCM_S32BE, + CODEC_ID_PCM_U32LE, + CODEC_ID_PCM_U32BE, + CODEC_ID_PCM_S24LE, + CODEC_ID_PCM_S24BE, + CODEC_ID_PCM_U24LE, + CODEC_ID_PCM_U24BE, + CODEC_ID_PCM_S24DAUD, + CODEC_ID_PCM_ZORK, + CODEC_ID_PCM_S16LE_PLANAR, + CODEC_ID_PCM_DVD, + CODEC_ID_PCM_F32BE, + CODEC_ID_PCM_F32LE, + CODEC_ID_PCM_F64BE, + CODEC_ID_PCM_F64LE, + CODEC_ID_PCM_BLURAY, + CODEC_ID_PCM_LXF, + CODEC_ID_S302M, + CODEC_ID_PCM_S8_PLANAR, + + /* various ADPCM codecs */ + CODEC_ID_ADPCM_IMA_QT = 0x11000, + CODEC_ID_ADPCM_IMA_WAV, + CODEC_ID_ADPCM_IMA_DK3, + CODEC_ID_ADPCM_IMA_DK4, + CODEC_ID_ADPCM_IMA_WS, + CODEC_ID_ADPCM_IMA_SMJPEG, + CODEC_ID_ADPCM_MS, + CODEC_ID_ADPCM_4XM, + CODEC_ID_ADPCM_XA, + CODEC_ID_ADPCM_ADX, + CODEC_ID_ADPCM_EA, + CODEC_ID_ADPCM_G726, + CODEC_ID_ADPCM_CT, + CODEC_ID_ADPCM_SWF, + CODEC_ID_ADPCM_YAMAHA, + CODEC_ID_ADPCM_SBPRO_4, + CODEC_ID_ADPCM_SBPRO_3, + CODEC_ID_ADPCM_SBPRO_2, + CODEC_ID_ADPCM_THP, + CODEC_ID_ADPCM_IMA_AMV, + CODEC_ID_ADPCM_EA_R1, + CODEC_ID_ADPCM_EA_R3, + CODEC_ID_ADPCM_EA_R2, + CODEC_ID_ADPCM_IMA_EA_SEAD, + CODEC_ID_ADPCM_IMA_EA_EACS, + CODEC_ID_ADPCM_EA_XAS, + CODEC_ID_ADPCM_EA_MAXIS_XA, + CODEC_ID_ADPCM_IMA_ISS, + CODEC_ID_ADPCM_G722, + CODEC_ID_ADPCM_IMA_APC, + CODEC_ID_VIMA = MKBETAG('V','I','M','A'), + + /* AMR */ + CODEC_ID_AMR_NB = 0x12000, + CODEC_ID_AMR_WB, + + /* RealAudio codecs*/ + CODEC_ID_RA_144 = 0x13000, + CODEC_ID_RA_288, + + /* various DPCM codecs */ + CODEC_ID_ROQ_DPCM = 0x14000, + CODEC_ID_INTERPLAY_DPCM, + CODEC_ID_XAN_DPCM, + CODEC_ID_SOL_DPCM, + + /* audio codecs */ + CODEC_ID_MP2 = 0x15000, + CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 + CODEC_ID_AAC, + CODEC_ID_AC3, + CODEC_ID_DTS, + CODEC_ID_VORBIS, + CODEC_ID_DVAUDIO, + CODEC_ID_WMAV1, + CODEC_ID_WMAV2, + CODEC_ID_MACE3, + CODEC_ID_MACE6, + CODEC_ID_VMDAUDIO, + CODEC_ID_FLAC, + CODEC_ID_MP3ADU, + CODEC_ID_MP3ON4, + CODEC_ID_SHORTEN, + CODEC_ID_ALAC, + CODEC_ID_WESTWOOD_SND1, + CODEC_ID_GSM, ///< as in Berlin toast format + CODEC_ID_QDM2, + CODEC_ID_COOK, + CODEC_ID_TRUESPEECH, + CODEC_ID_TTA, + CODEC_ID_SMACKAUDIO, + CODEC_ID_QCELP, + CODEC_ID_WAVPACK, + CODEC_ID_DSICINAUDIO, + CODEC_ID_IMC, + CODEC_ID_MUSEPACK7, + CODEC_ID_MLP, + CODEC_ID_GSM_MS, /* as found in WAV */ + CODEC_ID_ATRAC3, + CODEC_ID_VOXWARE, + CODEC_ID_APE, + CODEC_ID_NELLYMOSER, + CODEC_ID_MUSEPACK8, + CODEC_ID_SPEEX, + CODEC_ID_WMAVOICE, + CODEC_ID_WMAPRO, + CODEC_ID_WMALOSSLESS, + CODEC_ID_ATRAC3P, + CODEC_ID_EAC3, + CODEC_ID_SIPR, + CODEC_ID_MP1, + CODEC_ID_TWINVQ, + CODEC_ID_TRUEHD, + CODEC_ID_MP4ALS, + CODEC_ID_ATRAC1, + CODEC_ID_BINKAUDIO_RDFT, + CODEC_ID_BINKAUDIO_DCT, + CODEC_ID_AAC_LATM, + CODEC_ID_QDMC, + CODEC_ID_CELT, + CODEC_ID_G723_1, + CODEC_ID_G729, + CODEC_ID_8SVX_EXP, + CODEC_ID_8SVX_FIB, + CODEC_ID_BMV_AUDIO, + CODEC_ID_RALF, + CODEC_ID_IAC, + CODEC_ID_ILBC, + CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'), + CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'), + CODEC_ID_SONIC = MKBETAG('S','O','N','C'), + CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'), + CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'), + CODEC_ID_OPUS = MKBETAG('O','P','U','S'), + + /* subtitle codecs */ + CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. + CODEC_ID_DVD_SUBTITLE = 0x17000, + CODEC_ID_DVB_SUBTITLE, + CODEC_ID_TEXT, ///< raw UTF-8 text + CODEC_ID_XSUB, + CODEC_ID_SSA, + CODEC_ID_MOV_TEXT, + CODEC_ID_HDMV_PGS_SUBTITLE, + CODEC_ID_DVB_TELETEXT, + CODEC_ID_SRT, + CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'), + CODEC_ID_EIA_608 = MKBETAG('c','6','0','8'), + CODEC_ID_JACOSUB = MKBETAG('J','S','U','B'), + CODEC_ID_SAMI = MKBETAG('S','A','M','I'), + CODEC_ID_REALTEXT = MKBETAG('R','T','X','T'), + CODEC_ID_SUBVIEWER = MKBETAG('S','u','b','V'), + + /* other specific kind of codecs (generally used for attachments) */ + CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. + CODEC_ID_TTF = 0x18000, + CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'), + CODEC_ID_XBIN = MKBETAG('X','B','I','N'), + CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), + CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'), + + CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it + + CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS + * stream (only used by libavformat) */ + CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems + * stream (only used by libavformat) */ + CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. + +#endif /* AVCODEC_OLD_CODEC_IDS_H */