[vlc-commits] Add support for ProRes through Libavc

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep 16 11:39:23 2011 +0200| [0899262b24433d74a37ebbd31b30a1835671c955] | committer: Jean-Baptiste Kempf

Add support for ProRes through Libavc

Thanks Elvis

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0899262b24433d74a37ebbd31b30a1835671c955
---

 NEWS                           |    3 ++-
 include/vlc_fourcc.h           |    2 +-
 modules/codec/avcodec/fourcc.c |    5 +++++
 src/misc/fourcc.c              |    5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index dc7a729..fa78f58 100644
--- a/NEWS
+++ b/NEWS
@@ -60,11 +60,12 @@ Codecs:
  * Experimental Hardware decoding using Broadcom CrystalHD cards
  * New module for decoding EBU subtitles (.stl)
  * Support for 9bits and 10bits H.264/AVC decoding
- * Support for Lagarith Lossless video codec
  * Support for 20-bits PCM and DAT-12 (digital magnetic tapes) from RTP
  * New module for Dirac encoding, using the faster libschroedinger
    The Schroedinger module should be prefered to the Dirac one
  * Support for WMV Images, aka WMVP and WVP2, as used by Photo Story
+ * Support for Lagarith Lossless video codec
+ * Support for ProRes 422 video codec in 10bits
  * EIA-608 closed captions improvements
  * Support for JPEG 2000 and Motion JPEG 2000 in the Windows and Mac binaries
 
diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index b45f769..83ad3d3 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -118,7 +118,7 @@
 #define VLC_CODEC_JPEG2000  VLC_FOURCC('J','P','2','K')
 #define VLC_CODEC_LAGARITH  VLC_FOURCC('L','A','G','S')
 #define VLC_CODEC_FLASHSV2  VLC_FOURCC('F','S','V','2')
-
+#define VLC_CODEC_PRORES    VLC_FOURCC('a','p','c','n')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9       VLC_FOURCC('Y','V','U','9')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 7cdd839..ccccb2f 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -231,6 +231,11 @@ static const struct
     { VLC_CODEC_WMVP2, CODEC_ID_VC1IMAGE, VIDEO_ES },
 #endif
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 15, 0 )
+    { VLC_CODEC_PRORES, CODEC_ID_PRORES, VIDEO_ES },
+#endif
+
+
 #if 0
 /*    UNTESTED VideoGames*/
     { VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3,
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 6e8d85d..c6933e4 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -651,6 +651,11 @@ static const entry_t p_list_video[] = {
         A("IV50"),
         A("iv50"),
 
+    B(VLC_CODEC_PRORES, "Apple ProRes 422"),
+        E("apch", "Apple ProRes 422 HQ"),
+        E("apcs", "Apple ProRes 422 LT"),
+        E("apco", "Apple ProRes 422 Proxy"),
+        E("ap4c", "Apple ProRes 4444"),
 
     /* */
     B(VLC_CODEC_YV12, "Planar 4:2:0 YVU"),