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

Merge commit '1f008f34d5b2b5f6217521747e7acfe3efc0e666' 

* commit '1f008f34d5b2b5f6217521747e7acfe3efc0e666':
  rmenc: do not use AVCodecContext.frame_size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-01-01 15:51:58 +01:00
parent b47111b657 1f008f34d5
commit 53448461a7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/rmenc.c
View File

@ -185,9 +185,10 @@ static int rv10_write_header(AVFormatContext *ctx,
if (stream->enc->codec_type == AVMEDIA_TYPE_AUDIO) { if (stream->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
int coded_frame_size, fscode, sample_rate; int coded_frame_size, fscode, sample_rate;
int frame_size = av_get_audio_frame_duration(stream->enc, 0);
sample_rate = stream->enc->sample_rate; sample_rate = stream->enc->sample_rate;
coded_frame_size = (stream->enc->bit_rate * coded_frame_size = (stream->enc->bit_rate *
stream->enc->frame_size) / (8 * sample_rate); frame_size) / (8 * sample_rate);
/* audio codec info */ /* audio codec info */
avio_write(s, ".ra", 3); avio_write(s, ".ra", 3);
avio_w8(s, 0xfd); avio_w8(s, 0xfd);
@ -320,6 +321,7 @@ static int rm_write_header(AVFormatContext *s)
for(n=0;n<s->nb_streams;n++) { for(n=0;n<s->nb_streams;n++) {
AVStream *st = s->streams[n]; AVStream *st = s->streams[n];
int frame_size;
s->streams[n]->id = n; s->streams[n]->id = n;
codec = s->streams[n]->codec; codec = s->streams[n]->codec;
@ -332,7 +334,8 @@ static int rm_write_header(AVFormatContext *s)
switch(codec->codec_type) { switch(codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
rm->audio_stream = stream; rm->audio_stream = stream;
stream->frame_rate = (AVRational){codec->sample_rate, codec->frame_size}; frame_size = av_get_audio_frame_duration(codec, 0);
stream->frame_rate = (AVRational){codec->sample_rate, frame_size};
/* XXX: dummy values */ /* XXX: dummy values */
stream->packet_max_size = 1024; stream->packet_max_size = 1024;
stream->nb_packets = 0; stream->nb_packets = 0;