diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
| commit | 13795dbb642cecf46e75fb6a78c830bf862c2310 (patch) | |
| tree | 1464c0fd10f716b7c75920cc5b9298ca48251ca8 /libavcodec/ansi.c | |
| parent | a9ddb624890dd8c334617239793e63d93fbd52ee (diff) | |
| parent | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff) | |
| download | ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.gz | |
Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
rsodec: Use avpriv_report_missing_feature() where appropriate
Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ansi.c')
| -rw-r--r-- | libavcodec/ansi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index f259852427..93915f835f 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -241,7 +241,7 @@ static int execute_code(AVCodecContext * avctx, int c) height = 60<<4; break; default: - av_log_ask_for_sample(avctx, "unsupported screen mode\n"); + avpriv_request_sample(avctx, "Unsupported screen mode"); } if (width != avctx->width || height != avctx->height) { av_frame_unref(s->frame); @@ -316,7 +316,7 @@ static int execute_code(AVCodecContext * avctx, int c) } else if (m == 49) { s->fg = ansi_to_cga[DEFAULT_BG_COLOR]; } else { - av_log_ask_for_sample(avctx, "unsupported rendition parameter\n"); + avpriv_request_sample(avctx, "Unsupported rendition parameter"); } } break; @@ -333,7 +333,7 @@ static int execute_code(AVCodecContext * avctx, int c) s->y = av_clip(s->sy, 0, avctx->height - s->font_height); break; default: - av_log_ask_for_sample(avctx, "unsupported escape code\n"); + avpriv_request_sample(avctx, "Unknown escape code"); break; } return 0; |