diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-10-30 06:00:19 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-10-30 06:00:19 +0000 |
| commit | 80800258310fa4b54f6033a80b0f4bdce80c1d0a (patch) | |
| tree | 3b22a8026d4622f0f631f56652055f1b75f28a2f /src/libffmpeg/libavcodec/utils.c | |
| parent | cb8e9943d18bbacf6b2e99383df39a86f3febc09 (diff) | |
| download | xine-lib-80800258310fa4b54f6033a80b0f4bdce80c1d0a.tar.gz xine-lib-80800258310fa4b54f6033a80b0f4bdce80c1d0a.tar.bz2 | |
deploy revised ffmpeg palette API
CVS patchset: 5641
CVS date: 2003/10/30 06:00:19
Diffstat (limited to 'src/libffmpeg/libavcodec/utils.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/utils.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/utils.c b/src/libffmpeg/libavcodec/utils.c index 34051ad3a..ace54ef11 100644 --- a/src/libffmpeg/libavcodec/utils.c +++ b/src/libffmpeg/libavcodec/utils.c @@ -318,6 +318,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){ s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS; s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS; + s->palctrl = NULL; } /** @@ -523,6 +524,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 +610,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(); } |