[SCM] libav/experimental: Add ProRes FOURCCs to isom.c

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e65b1934bf4f2fbde611b75ea6c0c871daaf0b56
Author: Tomas Härdin <tomas.hardin at codemill.se>
Date:   Thu Feb 3 10:50:50 2011 +0100

    Add ProRes FOURCCs to isom.c
    
    Signed-off-by: Mans Rullgard <mans at mansr.com>

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 71a97b3..89b352c 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -195,6 +195,12 @@ const AVCodecTag codec_movvideo_tags[] = {
     { CODEC_ID_SGI,   MKTAG('s', 'g', 'i', ' ') }, /* SGI  */
     { CODEC_ID_DPX,   MKTAG('d', 'p', 'x', ' ') }, /* DPX */
 
+    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */
+    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */
+    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */
+    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
+    { CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
+
     { CODEC_ID_NONE, 0 },
 };
 

-- 
Libav/FFmpeg packaging