Commit db3c92c7 authored by bcoudurier's avatar bcoudurier

remove now useless sync key

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9188 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 902dddf4
...@@ -144,7 +144,6 @@ typedef struct MXFContext { ...@@ -144,7 +144,6 @@ typedef struct MXFContext {
int packages_count; int packages_count;
MXFMetadataSet **metadata_sets; MXFMetadataSet **metadata_sets;
int metadata_sets_count; int metadata_sets_count;
const uint8_t *sync_key;
AVFormatContext *fc; AVFormatContext *fc;
struct AVAES *aesc; struct AVAES *aesc;
} MXFContext; } MXFContext;
...@@ -332,7 +331,6 @@ err_out: ...@@ -332,7 +331,6 @@ err_out:
static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MXFContext *mxf = s->priv_data;
KLVPacket klv; KLVPacket klv;
while (!url_feof(&s->pb)) { while (!url_feof(&s->pb)) {
...@@ -343,7 +341,6 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -343,7 +341,6 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
#endif #endif
if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) { if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) {
int res = mxf_decrypt_triplet(s, pkt, &klv); int res = mxf_decrypt_triplet(s, pkt, &klv);
mxf->sync_key = mxf_encrypted_triplet_key;
if (res < 0) { if (res < 0) {
av_log(s, AV_LOG_ERROR, "invalid encoded triplet\n"); av_log(s, AV_LOG_ERROR, "invalid encoded triplet\n");
return -1; return -1;
...@@ -932,7 +929,6 @@ static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -932,7 +929,6 @@ static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
MXFContext *mxf = s->priv_data; MXFContext *mxf = s->priv_data;
KLVPacket klv; KLVPacket klv;
mxf->sync_key = mxf_essence_element_key;
if (!mxf_read_sync(&s->pb, mxf_header_partition_pack_key, 14)) { if (!mxf_read_sync(&s->pb, mxf_header_partition_pack_key, 14)) {
av_log(s, AV_LOG_ERROR, "could not find header partition pack key\n"); av_log(s, AV_LOG_ERROR, "could not find header partition pack key\n");
return -1; return -1;
......
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