comparison utils.c @ 8588:93dbb3999cc8 libavcodec

Remove hack to print mp2/mp1 with codec_id of CODEC_ID_MP3.
author michael
date Tue, 13 Jan 2009 19:38:54 +0000
parents 0a7fd7dbea1a
children 7a463923ecd1
comparison
equal deleted inserted replaced
8587:b3f3d9ffab1c 8588:93dbb3999cc8
644 else 644 else
645 p = avcodec_find_decoder(enc->codec_id); 645 p = avcodec_find_decoder(enc->codec_id);
646 646
647 if (p) { 647 if (p) {
648 codec_name = p->name; 648 codec_name = p->name;
649 if (!encode && enc->codec_id == CODEC_ID_MP3) {
650 if (enc->sub_id == 2)
651 codec_name = "mp2";
652 else if (enc->sub_id == 1)
653 codec_name = "mp1";
654 }
655 } else if (enc->codec_id == CODEC_ID_MPEG2TS) { 649 } else if (enc->codec_id == CODEC_ID_MPEG2TS) {
656 /* fake mpeg2 transport stream codec (currently not 650 /* fake mpeg2 transport stream codec (currently not
657 registered) */ 651 registered) */
658 codec_name = "mpeg2ts"; 652 codec_name = "mpeg2ts";
659 } else if (enc->codec_name[0] != '\0') { 653 } else if (enc->codec_name[0] != '\0') {