git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c76eac
)
FFMPEG: activate WMVA since it seems to work (tested with three different files)
author
Jean-Baptiste Kempf
<jb@videolan.org>
Fri, 11 May 2007 21:58:10 +0000
(21:58 +0000)
committer
Jean-Baptiste Kempf
<jb@videolan.org>
Fri, 11 May 2007 21:58:10 +0000
(21:58 +0000)
modules/codec/ffmpeg/ffmpeg.c
patch
|
blob
|
history
diff --git
a/modules/codec/ffmpeg/ffmpeg.c
b/modules/codec/ffmpeg/ffmpeg.c
index
58cecf7
..
eb80e7c
100644
(file)
--- a/
modules/codec/ffmpeg/ffmpeg.c
+++ b/
modules/codec/ffmpeg/ffmpeg.c
@@
-852,12
+852,11
@@
static struct
{ VLC_FOURCC('W','V','C','1'), CODEC_ID_VC1,
VIDEO_ES, "Windows Media Video VC1" },
#endif
-#if 0
+
/* WMVA is the VC-1 codec before the standardization proces,
it is not bitstream compatible and deprecated */
{ VLC_FOURCC('W','M','V','A'), CODEC_ID_VC1,
VIDEO_ES, "Windows Media Video Advanced Profile" },
-#endif
/* Microsoft Video 1 */
{ VLC_FOURCC('M','S','V','C'), CODEC_ID_MSVIDEO1,