Commit c9b3c0c7 authored by Michael Niedermayer's avatar Michael Niedermayer

Remove hack to print mp2/mp1 with codec_id of CODEC_ID_MP3.

Originally committed as revision 16583 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a14d138c
...@@ -646,12 +646,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) ...@@ -646,12 +646,6 @@ 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_id == CODEC_ID_MPEG2TS) { } else if (enc->codec_id == CODEC_ID_MPEG2TS) {
/* fake mpeg2 transport stream codec (currently not /* fake mpeg2 transport stream codec (currently not
registered) */ registered) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment