diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-01-13 19:38:54 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-01-13 19:38:54 +0000 |
commit | c9b3c0c740ac912c835ccb7179afc2c5da8d5d23 (patch) | |
tree | b9f66c243290820bd2e29b57383077d2084d31b0 /libavcodec/utils.c | |
parent | a14d138cb8be8a32c5ed4fb4d8aecb2aa1232236 (diff) | |
download | ffmpeg-streaming-c9b3c0c740ac912c835ccb7179afc2c5da8d5d23.zip ffmpeg-streaming-c9b3c0c740ac912c835ccb7179afc2c5da8d5d23.tar.gz |
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
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b622d1a..0d2d657 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -646,12 +646,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) if (p) { 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) { /* fake mpeg2 transport stream codec (currently not registered) */ |