[FFmpeg-cvslog] Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 15:49:47 2017 +0100| [3eed90b1ed6cd0d8fb2b3fbf665dd2504aaf5384] | committer: Clément Bœsch

Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'

* commit 'd9442d13033a24b14ebae149dcdb42709430e2d9':
  rm: Drop broken disabled cruft

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3eed90b1ed6cd0d8fb2b3fbf665dd2504aaf5384
---

 libavformat/rmdec.c | 13 -------------
 libavformat/rmenc.c |  8 --------
 2 files changed, 21 deletions(-)

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index c803588..222c433 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;
diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c
index 97ce711..0bc5bfd 100644
--- a/libavformat/rmenc.c
+++ b/libavformat/rmenc.c
@@ -400,7 +400,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) {
         av_log(s, AV_LOG_ERROR, "Muxing packets larger than 64 kB (%d) is not supported\n", size);
         return AVERROR_PATCHWELCOME;
@@ -422,13 +421,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);


======================================================================

diff --cc libavformat/rmenc.c
index 97ce711,59118c9..0bc5bfd
--- a/libavformat/rmenc.c
+++ b/libavformat/rmenc.c
@@@ -400,10 -389,9 +400,9 @@@ static int rm_write_video(AVFormatConte
  
      /* 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);
 +        av_log(s, AV_LOG_ERROR, "Muxing packets larger than 64 kB (%d) is not supported\n", size);
 +        return AVERROR_PATCHWELCOME;
      }
      write_packet_header(s, stream, size + 7 + (size >= 0x4000)*4, key_frame);
      /* bit 7: '1' if final packet of a frame converted in several packets */