diff -crN cinelerra-4.4/quicktime/mpeg4.c cinelerra-4.4-ejo/quicktime/mpeg4.c *** cinelerra-4.4/quicktime/mpeg4.c Wed Aug 20 04:09:14 2008 --- cinelerra-4.4-ejo/quicktime/mpeg4.c Sat Dec 29 01:05:16 2012 *************** *** 1276,1283 **** result->ffmpeg_id = CODEC_ID_MPEG4; } ! ! ! ! --- 1276,1295 ---- result->ffmpeg_id = CODEC_ID_MPEG4; } + void quicktime_init_codec_dnxhd(quicktime_video_map_t *vtrack) + { + quicktime_mpeg4_codec_t *result = init_common(vtrack, + QUICKTIME_DNXHD, + "DNXHD", + "DNXHD"); + result->ffmpeg_id = CODEC_ID_DNXHD; + } ! void quicktime_init_codec_dv5n(quicktime_video_map_t *vtrack) ! { ! quicktime_mpeg4_codec_t *result = init_common(vtrack, ! QUICKTIME_DV5N, ! "DV50", ! "DV50"); ! result->ffmpeg_id = CODEC_ID_DVVIDEO; ! } diff -crN cinelerra-4.4/quicktime/mpeg4.h cinelerra-4.4-ejo/quicktime/mpeg4.h *** cinelerra-4.4/quicktime/mpeg4.h Tue Jan 9 02:09:49 2007 --- cinelerra-4.4-ejo/quicktime/mpeg4.h Sat Dec 29 01:05:18 2012 *************** *** 15,21 **** extern void quicktime_init_codec_svq3(quicktime_video_map_t *); extern void quicktime_init_codec_h263(quicktime_video_map_t *); extern void quicktime_init_codec_xvid(quicktime_video_map_t *); extern void quicktime_init_codec_div5(quicktime_video_map_t *vtrack); - #endif --- 15,22 ---- extern void quicktime_init_codec_svq3(quicktime_video_map_t *); extern void quicktime_init_codec_h263(quicktime_video_map_t *); extern void quicktime_init_codec_xvid(quicktime_video_map_t *); + extern void quicktime_init_codec_dnxhd(quicktime_video_map_t *); + extern void quicktime_init_codec_dv5n(quicktime_video_map_t *); extern void quicktime_init_codec_div5(quicktime_video_map_t *vtrack); #endif diff -crN cinelerra-4.4/quicktime/plugin.c cinelerra-4.4-ejo/quicktime/plugin.c *** cinelerra-4.4/quicktime/plugin.c Tue Jan 9 02:09:49 2007 --- cinelerra-4.4-ejo/quicktime/plugin.c Sat Dec 29 01:05:27 2012 *************** *** 94,105 **** --- 94,107 ---- register_vcodec(quicktime_init_codec_div3lower); register_vcodec(quicktime_init_codec_mp4v); register_vcodec(quicktime_init_codec_xvid); + register_vcodec(quicktime_init_codec_dnxhd); register_vcodec(quicktime_init_codec_svq1); register_vcodec(quicktime_init_codec_svq3); register_vcodec(quicktime_init_codec_h263); register_vcodec(quicktime_init_codec_dv); register_vcodec(quicktime_init_codec_dvsd); register_vcodec(quicktime_init_codec_dvcp); + register_vcodec(quicktime_init_codec_dv5n); register_vcodec(quicktime_init_codec_jpeg); register_vcodec(quicktime_init_codec_mjpa); diff -crN cinelerra-4.4/quicktime/quicktime.h cinelerra-4.4-ejo/quicktime/quicktime.h *** cinelerra-4.4/quicktime/quicktime.h Sat Jun 5 19:11:59 2010 --- cinelerra-4.4-ejo/quicktime/quicktime.h Sat Dec 29 01:06:23 2012 *************** *** 23,28 **** --- 23,29 ---- #define QUICKTIME_MP42 "MP42" #define QUICKTIME_DIVX "DIVX" #define QUICKTIME_XVID "XVID" + #define QUICKTIME_DNXHD "AVdn" #define QUICKTIME_MP4V "mp4v" #define QUICKTIME_H264 "avc1" *************** *** 49,54 **** --- 50,56 ---- #define QUICKTIME_DV25 "dv25" #define QUICKTIME_DVSD "dvsd" #define QUICKTIME_DVCP "dvcp" // PAL video inside Quicktime + #define QUICKTIME_DV5N "dv5n" /* RGB uncompressed. Allows alpha */ #define QUICKTIME_RAW "raw "