Commit 40a42de8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

[FFmpeg] support for native RV40

(cherry picked from commit 07dc019f)

Conflicts:

	modules/codec/avcodec/fourcc.h
parent 88c45015
...@@ -543,20 +543,27 @@ static const struct ...@@ -543,20 +543,27 @@ static const struct
/* Real Video */ /* Real Video */
{ VLC_FOURCC('R','V','1','0'), CODEC_ID_RV10, { VLC_FOURCC('R','V','1','0'), CODEC_ID_RV10,
VIDEO_ES, "Real Video 10" }, VIDEO_ES, "Real Video 1.0" },
{ VLC_FOURCC('r','v','1','0'), CODEC_ID_RV10, { VLC_FOURCC('r','v','1','0'), CODEC_ID_RV10,
VIDEO_ES, "Real Video 10" }, VIDEO_ES, "Real Video 1.0" },
{ VLC_FOURCC('R','V','1','3'), CODEC_ID_RV10, { VLC_FOURCC('R','V','1','3'), CODEC_ID_RV10,
VIDEO_ES, "Real Video 13" }, VIDEO_ES, "Real Video 1.3" },
{ VLC_FOURCC('r','v','1','3'), CODEC_ID_RV10, { VLC_FOURCC('r','v','1','3'), CODEC_ID_RV10,
VIDEO_ES, "Real Video 13" }, VIDEO_ES, "Real Video 13" },
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(15<<8)+1) #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(15<<8)+1)
{ VLC_FOURCC('R','V','2','0'), CODEC_ID_RV20, { VLC_FOURCC('R','V','2','0'), CODEC_ID_RV20,
VIDEO_ES, "Real Video 20" }, VIDEO_ES, "Real Video 2.0" },
{ VLC_FOURCC('r','v','2','0'), CODEC_ID_RV20, { VLC_FOURCC('r','v','2','0'), CODEC_ID_RV20,
VIDEO_ES, "Real Video 20" }, VIDEO_ES, "Real Video 2.0" },
#endif
#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(5<<8)+0)
{ VLC_FOURCC('R','V','4','0'), CODEC_ID_RV40,
VIDEO_ES, "Real Video 4.0" },
{ VLC_FOURCC('r','v','4','0'), CODEC_ID_RV40,
VIDEO_ES, "Real Video 4.0" },
#endif #endif
/* Apple Video */ /* Apple Video */
{ VLC_FOURCC('r','p','z','a'), CODEC_ID_RPZA, { VLC_FOURCC('r','p','z','a'), CODEC_ID_RPZA,
VIDEO_ES, "Apple Video" }, VIDEO_ES, "Apple Video" },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment