diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-07-30 13:51:23 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-08-17 12:16:42 +0200 |
| commit | d9442d13033a24b14ebae149dcdb42709430e2d9 (patch) | |
| tree | 37aab203e392d6326e8d5121cd8f4857f5eeaf65 /libavformat | |
| parent | dab2034b8679aaacd8aef832cdeb71d0ee8a3358 (diff) | |
rm: Drop broken disabled cruft
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rmdec.c | 13 | ||||
| -rw-r--r-- | libavformat/rmenc.c | 8 |
2 files changed, 0 insertions, 21 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 504f111ac0..9774194e8e 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -785,19 +785,6 @@ ff_rm_parse_packet (AVFormatContext *s, AVIOContext *pb, pkt->stream_index = st->index; -#if 0 - if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - if(st->codecpar->codec_id == AV_CODEC_ID_RV20){ - int seq= 128*(pkt->data[2]&0x7F) + (pkt->data[3]>>1); - av_log(s, AV_LOG_DEBUG, "%d %"PRId64" %d\n", *timestamp, *timestamp*512LL/25, seq); - - seq |= (timestamp&~0x3FFF); - if(seq - timestamp > 0x2000) seq -= 0x4000; - if(seq - timestamp < -0x2000) seq += 0x4000; - } - } -#endif - pkt->pts = timestamp; if (flags & 2) pkt->flags |= AV_PKT_FLAG_KEY; diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 8499e6384c..59118c9484 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -389,7 +389,6 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int /* Well, I spent some time finding the meaning of these bits. I am not sure I understood everything, but it works !! */ -#if 1 if (size > MAX_PACKET_SIZE) { avpriv_report_missing_feature(s, "Muxing packets larger than 64 kB"); return AVERROR(ENOSYS); @@ -411,13 +410,6 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int avio_wb16(pb, 0x4000 | size); /* total frame size */ avio_wb16(pb, 0x4000 | size); /* offset from the start or the end */ } -#else - /* full frame */ - write_packet_header(s, size + 6); - avio_w8(pb, 0xc0); - avio_wb16(pb, 0x4000 + size); /* total frame size */ - avio_wb16(pb, 0x4000 + packet_number * 126); /* position in stream */ -#endif avio_w8(pb, stream->nb_frames & 0xff); avio_write(pb, buf, size); |