diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-11-07 18:38:33 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-11-07 18:38:33 +0000 |
| commit | 375017725eb17f73c095fd7da2a673a07801066d (patch) | |
| tree | 98924a66d8ee951fa6d9e0a7f6ee69f684d29138 | |
| parent | ce74fa96710338ac97c935cd6cf9c834f9e01701 (diff) | |
| parent | d21d61e759acc7a390f5e755277d28bea14cf242 (diff) | |
| download | xine-lib-375017725eb17f73c095fd7da2a673a07801066d.tar.gz xine-lib-375017725eb17f73c095fd7da2a673a07801066d.tar.bz2 | |
Merge.
| -rw-r--r-- | src/xine-engine/buffer_types.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 911e123ed..8bee0e791 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -659,6 +659,8 @@ static const video_db_t video_db[] = { ME_FOURCC('a','v','c','1'), ME_FOURCC('h','2','6','4'), ME_FOURCC('H','2','6','4'), + ME_FOURCC('x','2','6','4'), + ME_FOURCC('X','2','6','4'), 0 }, BUF_VIDEO_H264, |