added fake codec CODEC_ID_MPEG2TS of type CODEC_TYPE_DATA (needed for simpler handling of raw transport streams in ffserver and RTP - better solutions are welcomed)
Originally committed as revision 2445 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@@ -523,6 +523,10 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||
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) */
|
||||
codec_name = "mpeg2ts";
|
||||
} else if (enc->codec_name[0] != '\0') {
|
||||
codec_name = enc->codec_name;
|
||||
} else {
|
||||
@@ -605,6 +609,10 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case CODEC_TYPE_DATA:
|
||||
snprintf(buf, buf_size, "Data: %s", codec_name);
|
||||
bitrate = enc->bit_rate;
|
||||
break;
|
||||
default:
|
||||
av_abort();
|
||||
}
|
||||
|
Reference in New Issue
Block a user