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

update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?) 

Originally committed as revision 2238 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-09-08 22:49:26 +00:00
parent 6a58e1510d
commit 98ce5991d7
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/mpegaudiodec.c
View File

@ -2481,6 +2481,7 @@ static int decode_frame(AVCodecContext * avctx,
avctx->sample_rate = s->sample_rate; avctx->sample_rate = s->sample_rate;
avctx->channels = s->nb_channels; avctx->channels = s->nb_channels;
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
avctx->sub_id = s->layer;
switch(s->layer) { switch(s->layer) {
case 1: case 1:
avctx->frame_size = 384; avctx->frame_size = 384;

6
libavcodec/utils.c
View File

@ -470,6 +470,12 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
if (p) { if (p) {
codec_name = p->name; codec_name = p->name;
if (!encode && enc->codec_id == CODEC_ID_MP3) {
if (enc->sub_id == 2)
codec_name = "mp2";
else if (enc->sub_id == 1)
codec_name = "mp1";
}
} else if (enc->codec_name[0] != '\0') { } else if (enc->codec_name[0] != '\0') {
codec_name = enc->codec_name; codec_name = enc->codec_name;
} else { } else {