summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@users.sourceforge.net>2004-09-01 12:52:34 +0000
committerBastien Nocera <hadess@users.sourceforge.net>2004-09-01 12:52:34 +0000
commitd69afc6a2f24c9266a28939d68d059df704b11ef (patch)
tree0a91dc40b977d349e0b738ea2aa9484f8398dba5
parentaa02812764f10d9788e055b45654c21c7fbde63b (diff)
downloadxine-lib-d69afc6a2f24c9266a28939d68d059df704b11ef.tar.gz
xine-lib-d69afc6a2f24c9266a28939d68d059df704b11ef.tar.bz2
- add a nice name for the AVC1 codec
CVS patchset: 6925 CVS date: 2004/09/01 12:52:34
-rw-r--r--src/xine-engine/buffer.h3
-rw-r--r--src/xine-engine/buffer_types.c10
2 files changed, 11 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index d0a850ee2..3a2620b12 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer.h,v 1.141 2004/08/27 21:07:31 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.142 2004/09/01 12:52:34 hadess Exp $
*
*
* contents:
@@ -166,6 +166,7 @@ extern "C" {
#define BUF_VIDEO_BITPLANE 0x024A0000 /* Amiga typical picture and animation format */
#define BUF_VIDEO_BITPLANE_BR1 0x024B0000 /* the same with Bytrun compression 1 */
#define BUF_VIDEO_FLV1 0x024C0000
+#define BUF_VIDEO_H264 0x024D0000
/* audio buffer types: (please keep in sync with buffer_types.c) */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index 86b52858b..79105e3c8 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: buffer_types.c,v 1.83 2004/08/27 18:36:06 miguelfreitas Exp $
+ * $Id: buffer_types.c,v 1.84 2004/09/01 12:52:34 hadess Exp $
*
*
* contents:
@@ -631,6 +631,14 @@ static video_db_t video_db[] = {
BUF_VIDEO_ASV2,
"ASV v2 Video"
},
+{
+ {
+ meFOURCC('a','v','c','1'),
+ 0
+ },
+ BUF_VIDEO_H264,
+ "Apple Video Codec (H264)"
+},
{ { 0 }, 0, "last entry" }
};