[FFmpeg-devel] [PATCH] Add CODEC_ID_PRORES and FOURCCs

[Tomas Härdin]

M?ns Rullg?rd skrev 2011-02-03 11:45:
> Tomas H?rdin<tomas.hardin at codemill.se>  writes:
>
>> Hi
>>
>> The attached patches add CODEC_ID_PRORES and related FOURCCs. This
>> enables remuxing ProRes video.
>
> In the future, please send one patch per email.

Ah, OK. It seems git can do that automagically. Hopefully that works in 
Windows as well, or I'll have to set up my mail in my virtual Ubuntu 
install as well. Until then I suppose manually threading the patches 
works well enough.

>>  From 6c51c23d651a5888c581ccf3b7476e55f71d5b7a Mon Sep 17 00:00:00 2001
>> From: Tjoppen<tomas.hardin at codemill.se>
>
> Do you really want that listed as your name in the commits?  Your
> older commits have your real name.

Yes, you're right. Updated patches attached. Hopefully git and 
Thunderbird didn't mess up the encoding.

>> Date: Thu, 3 Feb 2011 10:47:48 +0100
>> Subject: [PATCH 1/2] Add CODEC_ID_PRORES and bump lavc minor version
>>
>> ---
>>   libavcodec/avcodec.h |    3 ++-
>>   1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
>> index d0de610..dbfb777 100644
>> --- a/libavcodec/avcodec.h
>> +++ b/libavcodec/avcodec.h
>> @@ -32,7 +32,7 @@
>>   #include "libavutil/cpu.h"
>>
>>   #define LIBAVCODEC_VERSION_MAJOR 52
>> -#define LIBAVCODEC_VERSION_MINOR 108
>> +#define LIBAVCODEC_VERSION_MINOR 109
>>   #define LIBAVCODEC_VERSION_MICRO  0
>>
>>   #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
>> @@ -260,6 +260,7 @@ enum CodecID {
>>       CODEC_ID_R10K,
>>       CODEC_ID_MXPEG,
>>       CODEC_ID_LAGARITH,
>> +    CODEC_ID_PRORES,
>>
>>       /* various PCM "codecs" */
>>       CODEC_ID_PCM_S16LE= 0x10000,
>> --
>> 1.7.1
>
> Looks fine.  Please also add note to APIchanges.

See 0002-Add-APIchanges-entry-for-lavc-52.109.0.patch

>>  From ab38987b255fe524e9f336675cee73171e32864c Mon Sep 17 00:00:00 2001
>> From: Tjoppen<tomas.hardin at codemill.se>
>> Date: Thu, 3 Feb 2011 10:50:50 +0100
>> Subject: [PATCH 2/2] Add ProRes FOURCCs to isom.c
>>
>> ---
>>   libavformat/isom.c |    6 ++++++
>>   1 files changed, 6 insertions(+), 0 deletions(-)
>>
>> diff --git a/libavformat/isom.c b/libavformat/isom.c
>> index 23ef82a..aa1f959 100644
>> --- a/libavformat/isom.c
>> +++ b/libavformat/isom.c
>> @@ -193,6 +193,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 },
>>   };
>>
>> --
>> 1.7.1
>
> OK and queued.

Updated the patch with fixed name. Re-queue if you like.

I'll post two replies with patches 0002 and 0003 and see if that works.

/Tomas