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/rmenc.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/rmenc.c')
| -rw-r--r-- | libavformat/rmenc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 97ce711a46..0bc5bfd92b 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); |