virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

remove now useless sync key

Browse Source 
Originally committed as revision 9188 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-06-03 17:20:35 +00:00
parent 6dc5554328
commit 0e3ea3a26b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mxf.c
View File

@ -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:
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)
#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)
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;