diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-10-29 17:09:31 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-10-29 17:09:31 +0000 |
commit | 5a10eb278db0b2629967c52ff84d4a87c0e021c7 (patch) | |
tree | f3d82fd971be308c50425dcb3f6b0b50b2e6c757 /src/xine-engine | |
parent | d75bda83c7b1f6d1b9805ae651c33658e5b060ed (diff) | |
parent | 09d7a31dac92a6eb2aa5d4096a4f80e9761d7df8 (diff) | |
download | xine-lib-5a10eb278db0b2629967c52ff84d4a87c0e021c7.tar.gz xine-lib-5a10eb278db0b2629967c52ff84d4a87c0e021c7.tar.bz2 |
Merge from 1.1.
Spanish translation merge needs checking.
Diffstat (limited to 'src/xine-engine')
-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 f686f61a1..0421fecc8 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -59,6 +59,7 @@ static const video_db_t video_db[] = { ME_FOURCC('P', 'I', 'M', '1'), ME_FOURCC('m', 'p', 'g', '2'), ME_FOURCC('m', 'p', 'g', '1'), + ME_FOURCC(0x02, 0, 0, 0x10), 0 }, BUF_VIDEO_MPEG, @@ -1212,3 +1213,4 @@ void _x_waveformatex_le2me( xine_waveformatex *wavex ) { wavex->wBitsPerSample = le2me_16(wavex->wBitsPerSample); wavex->cbSize = le2me_16(wavex->cbSize); } + |