diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:49:47 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:49:47 +0100 |
| commit | 3eed90b1ed6cd0d8fb2b3fbf665dd2504aaf5384 (patch) | |
| tree | 6b5156867b6a90d38f027fb01629c25958283096 /libavformat/rmdec.c | |
| parent | 4ded6f9b312731a7cbac7da2c097eeeab8c1954e (diff) | |
| parent | d9442d13033a24b14ebae149dcdb42709430e2d9 (diff) | |
| download | ffmpeg-3eed90b1ed6cd0d8fb2b3fbf665dd2504aaf5384.tar.gz | |
Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'
* commit 'd9442d13033a24b14ebae149dcdb42709430e2d9':
rm: Drop broken disabled cruft
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index c803588939..222c43378c 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -964,19 +964,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; |