diff options
| author | Marton Balint <cus@passwd.hu> | 2018-06-10 12:00:06 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2018-07-04 21:52:21 +0200 |
| commit | afd09131ff587d940c85843f4cd03ee8ce753acf (patch) | |
| tree | 8da5803b1b865a666a56378a7b86037562638531 | |
| parent | 00a2652df3bf25a27d174cc67ed508b5317cb115 (diff) | |
| download | ffmpeg-afd09131ff587d940c85843f4cd03ee8ce753acf.tar.gz | |
avformat/mxfdec: fix indentation and rename mxf_read_packet_old
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/mxfdec.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index c25595a91f..fb03cb97f1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3284,7 +3284,7 @@ static int mxf_set_pts(MXFContext *mxf, AVStream *st, AVPacket *pkt) return 0; } -static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) +static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) { KLVPacket klv; MXFContext *mxf = s->priv_data; @@ -3295,22 +3295,22 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) int64_t pos = avio_tell(s->pb); if (pos < mxf->current_klv_data.next_klv - mxf->current_klv_data.length || pos >= mxf->current_klv_data.next_klv) { - mxf->current_klv_data = (KLVPacket){{0}}; - ret = klv_read_packet(&klv, s->pb); - if (ret < 0) - break; - max_data_size = klv.length; - pos = klv.next_klv - klv.length; - PRINT_KEY(s, "read packet", klv.key); - av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset); - if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) { - ret = mxf_decrypt_triplet(s, pkt, &klv); - if (ret < 0) { - av_log(s, AV_LOG_ERROR, "invalid encoded triplet\n"); - return ret; + mxf->current_klv_data = (KLVPacket){{0}}; + ret = klv_read_packet(&klv, s->pb); + if (ret < 0) + break; + max_data_size = klv.length; + pos = klv.next_klv - klv.length; + PRINT_KEY(s, "read packet", klv.key); + av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset); + if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) { + ret = mxf_decrypt_triplet(s, pkt, &klv); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "invalid encoded triplet\n"); + return ret; + } + return 0; } - return 0; - } } else { klv = mxf->current_klv_data; max_data_size = klv.next_klv - pos; @@ -3580,7 +3580,7 @@ AVInputFormat ff_mxf_demuxer = { .priv_data_size = sizeof(MXFContext), .read_probe = mxf_probe, .read_header = mxf_read_header, - .read_packet = mxf_read_packet_old, + .read_packet = mxf_read_packet, .read_close = mxf_read_close, .read_seek = mxf_read_seek, }; |