diff options
| -rw-r--r-- | libavcodec/ptx.c | 4 | ||||
| -rw-r--r-- | libavformat/asfdec.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 28df0b6f2e..426f46ce6c 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -51,14 +51,14 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, bytes_per_pixel = AV_RL16(buf+12) >> 3; if (bytes_per_pixel != 2) { - av_log(avctx, AV_LOG_ERROR, "image format is not rgb15, please report on ffmpeg-users mailing list\n"); + av_log_ask_for_sample(avctx, "Image format is not RGB15.\n"); return -1; } avctx->pix_fmt = PIX_FMT_RGB555; if (offset != 0x2c) - av_log(avctx, AV_LOG_WARNING, "offset != 0x2c, untested due to lack of sample files\n"); + av_log_ask_for_sample(avctx, "offset != 0x2c\n"); buf += offset; diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index cafcf857c5..8e228c6c34 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -1124,12 +1124,8 @@ static void asf_reset_header(AVFormatContext *s) static int asf_read_close(AVFormatContext *s) { - int i; - asf_reset_header(s); - for(i=0;i<s->nb_streams;i++) { - AVStream *st = s->streams[i]; - } + return 0; } |