Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'

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

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

diff --cc libavformat/rmdec.c
Simple merge

diff --cc libavformat/rmenc.c
index 97ce711a46d217c6664f88996c468b0f8c0e0610,59118c94840a81ca7055aa1f25843d1c9dde8b51..0bc5bfd92bb6362953a116b8a8b7d8c9362e8dca
--- 1/libavformat/rmenc.c
--- 2/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 */