* added 'x264' as valid FOURCC for H.264, although it is an unofficial one used by strange apps

e1fd2642 · Felix Paul Kühne · 697ec2d5 · e1fd2642
Commit e1fd2642 authored Dec 08, 2005 by Felix Paul Kühne
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

modules/codec/ffmpeg/ffmpeg.c modules/codec/ffmpeg/ffmpeg.c +2 -0

No files found.
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -620,6 +620,8 @@ static struct
      VIDEO_ES, "h264" },
    { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264,
      VIDEO_ES, "h264" },
+    { VLC_FOURCC('x','2','6','4'), CODEC_ID_H264,
+      VIDEO_ES, "h264" },
    /* avc1: special case h264 */
    { VLC_FOURCC('a','v','c','1'), CODEC_ID_H264,
      VIDEO_ES, "h264" },