# HG changeset patch # User cehoyos # Date 1318696385 0 # Node ID 5f7c090e5ae8edc9ee220f32578ee3c04edc12c6 # Parent 3d7ee643b110be5e574197c97f9dc838b5d5540d Support H264 from QNAP Systems. diff -r 3d7ee643b110 -r 5f7c090e5ae8 etc/codecs.conf --- a/etc/codecs.conf Sat Oct 15 13:20:52 2011 +0000 +++ b/etc/codecs.conf Sat Oct 15 16:33:05 2011 +0000 @@ -1108,6 +1108,7 @@ fourcc ai5p,ai5q,ai52,ai53 fourcc ai55,ai56 fourcc x3eV + fourcc Q264 format 0x10000005 driver ffmpeg dll h264 @@ -1125,6 +1126,7 @@ fourcc ai5p,ai5q,ai52,ai53 fourcc ai55,ai56 fourcc x3eV + fourcc Q264 format 0x10000005 driver ffmpeg dll h264_vdpau