RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd34039b171bebe37bf723a1b03e5651267099739' 

* commit 'd34039b171bebe37bf723a1b03e5651267099739':
  rmenc: Drop the temporary buffer for ac3 byteswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-20 22:24:15 +02:00
parent 3cd6f4546a d34039b171
commit d108820c2e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/rmenc.c
View File

@ -360,31 +360,23 @@ static int rm_write_header(AVFormatContext *s)
static int rm_write_audio(AVFormatContext *s, const uint8_t *buf, int size, int flags) static int rm_write_audio(AVFormatContext *s, const uint8_t *buf, int size, int flags)
{ {
uint8_t *buf1;
RMMuxContext *rm = s->priv_data; RMMuxContext *rm = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
StreamInfo *stream = rm->audio_stream; StreamInfo *stream = rm->audio_stream;
int i; int i;
/* XXX: suppress this malloc */
buf1 = av_malloc(size * sizeof(uint8_t));
if (!buf1)
return AVERROR(ENOMEM);
write_packet_header(s, stream, size, !!(flags & AV_PKT_FLAG_KEY)); write_packet_header(s, stream, size, !!(flags & AV_PKT_FLAG_KEY));
if (stream->enc->codec_id == AV_CODEC_ID_AC3) { if (stream->enc->codec_id == AV_CODEC_ID_AC3) {
/* for AC-3, the words seem to be reversed */ /* for AC-3, the words seem to be reversed */
for (i = 0; i < size; i += 2) { for (i = 0; i < size; i += 2) {
buf1[i] = buf[i+1]; avio_w8(pb, buf[i + 1]);
buf1[i+1] = buf[i]; avio_w8(pb, buf[i]);
} }
avio_write(pb, buf1, size);
} else { } else {
avio_write(pb, buf, size); avio_write(pb, buf, size);
} }
stream->nb_frames++; stream->nb_frames++;
av_free(buf1);
return 0; return 0;
} }