Re: [FFmpeg-devel] [PATCH v2] added ULs for demuxing avid media composer mxf files

2014-08-14 Thread Michael Niedermayer 
On Tue, Aug 12, 2014 at 02:58:04PM -0700, Mark Reid wrote:
> UL values copied from FMbc version of mxf.c
> Fixes Ticket#1554, Ticket#3100 and Ticket#3450
> ---
>  libavformat/mxf.c | 3 +++
>  1 file changed, 3 insertions(+)

missing signed-off

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH v2] added ULs for demuxing avid media composer mxf files

2014-08-14 Thread Tomas Härdin 
On Tue, 2014-08-12 at 14:58 -0700, Mark Reid wrote:
> UL values copied from FMbc version of mxf.c
> Fixes Ticket#1554, Ticket#3100 and Ticket#3450
> ---
>  libavformat/mxf.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/libavformat/mxf.c b/libavformat/mxf.c
> index d20ed94..8ebfdf2 100644
> --- a/libavformat/mxf.c
> +++ b/libavformat/mxf.c
> @@ -28,6 +28,8 @@
>  const MXFCodecUL ff_mxf_data_definition_uls[] = {
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00
>  }, 13, AVMEDIA_TYPE_VIDEO },
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00
>  }, 13, AVMEDIA_TYPE_AUDIO },
> +{ { 
> 0x80,0x7D,0x00,0x60,0x08,0x14,0x3E,0x6F,0x6F,0x3C,0x8C,0xE1,0x6C,0xEF,0x11,0xD2
>  }, 16, AVMEDIA_TYPE_VIDEO }, /* Avid Media Composer MXF */
> +{ { 
> 0x80,0x7D,0x00,0x60,0x08,0x14,0x3E,0x6F,0x78,0xE1,0xEB,0xE1,0x6C,0xEF,0x11,0xD2
>  }, 16, AVMEDIA_TYPE_AUDIO }, /* Avid Media Composer MXF */
>  { { 
> 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
>  },  0,  AVMEDIA_TYPE_DATA },
>  };
>  
> @@ -44,6 +46,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00
>  }, 15,   AV_CODEC_ID_RAWVIDEO }, /* Uncompressed 422 8-bit */
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00
>  }, 13,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00
>  }, 14,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
> +{ { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x04,0x01,0x00
>  }, 16,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD Avid Media Composer MXF 
> */
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00
>  }, 14,   AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x31,0x11,0x01
>  }, 14,   AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC SPS/PPS in-band */
>  { { 
> 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01
>  }, 16,   AV_CODEC_ID_V210 }, /* V210 */

Looks OK. Checked the codec UL, seems correct.

/Tomas


signature.asc
Description: This is a digitally signed message part
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH v2] added ULs for demuxing avid media composer mxf files

2014-08-12 Thread Mark Reid 
Changes since v1:
* add more descriptive commit message

Mark Reid (1):
  added ULs for demuxing avid media composer mxf files

 libavformat/mxf.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.0.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH v2] added ULs for demuxing avid media composer mxf files

2014-08-12 Thread Mark Reid 
UL values copied from FMbc version of mxf.c
Fixes Ticket#1554, Ticket#3100 and Ticket#3450
---
 libavformat/mxf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index d20ed94..8ebfdf2 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -28,6 +28,8 @@
 const MXFCodecUL ff_mxf_data_definition_uls[] = {
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 
}, 13, AVMEDIA_TYPE_VIDEO },
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 
}, 13, AVMEDIA_TYPE_AUDIO },
+{ { 
0x80,0x7D,0x00,0x60,0x08,0x14,0x3E,0x6F,0x6F,0x3C,0x8C,0xE1,0x6C,0xEF,0x11,0xD2 
}, 16, AVMEDIA_TYPE_VIDEO }, /* Avid Media Composer MXF */
+{ { 
0x80,0x7D,0x00,0x60,0x08,0x14,0x3E,0x6F,0x78,0xE1,0xEB,0xE1,0x6C,0xEF,0x11,0xD2 
}, 16, AVMEDIA_TYPE_AUDIO }, /* Avid Media Composer MXF */
 { { 
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 
},  0,  AVMEDIA_TYPE_DATA },
 };
 
@@ -44,6 +46,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00 
}, 15,   AV_CODEC_ID_RAWVIDEO }, /* Uncompressed 422 8-bit */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 
}, 13,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 
}, 14,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
+{ { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x04,0x01,0x00 
}, 16,  AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD Avid Media Composer MXF */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 
}, 14,   AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x31,0x11,0x01 
}, 14,   AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC SPS/PPS in-band */
 { { 
0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 
}, 16,   AV_CODEC_ID_V210 }, /* V210 */
-- 
2.0.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel