Skip to content

F
ffmpeg
Commit 8214c1d8 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

mxfenc: avoid depending on private codec structures and functions 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3db02b83
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
libavformat/mxfenc.c
View file @ 8214c1d8
...@@ -1401,7 +1401,7 @@ AVPacket *pkt) ...@@ -1401,7 +1401,7 @@ AVPacket *pkt)
MXFStreamContext *sc = st->priv_data; MXFStreamContext *sc = st->priv_data;
int i, cid; int i, cid;
uint8_t* header_cid; uint8_t* header_cid;
unsigned int frame_size = 0; int frame_size = 0;
if (mxf->header_written) if (mxf->header_written)
return 1; return 1;
...@@ -1412,7 +1412,7 @@ AVPacket *pkt) ...@@ -1412,7 +1412,7 @@ AVPacket *pkt)
header_cid = pkt->data + 0x28; header_cid = pkt->data + 0x28;
cid = header_cid[0] << 24 | header_cid[1] << 16 | header_cid[2] << 8 | header_cid[3]; cid = header_cid[0] << 24 | header_cid[1] << 16 | header_cid[2] << 8 | header_cid[3];
if ((i = ff_dnxhd_get_cid_table(cid)) < 0) if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) < 0)
return -1; return -1;
switch (cid) { switch (cid) {
...@@ -1453,7 +1453,6 @@ AVPacket *pkt) ...@@ -1453,7 +1453,6 @@ AVPacket *pkt)
return -1; return -1;
} }
frame_size = ff_dnxhd_cid_table[i].frame_size;
sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul; sc->codec_ul = &mxf_essence_container_uls[sc->index].codec_ul;
sc->aspect_ratio = (AVRational){ 16, 9 }; sc->aspect_ratio = (AVRational){ 16, 9 };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment