Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n1.0
| @@ -235,7 +235,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){ | |||||
| frame_num += duration; | frame_num += duration; | ||||
| if(avio_seek(pb, pos, SEEK_SET) < 0) { | if(avio_seek(pb, pos, SEEK_SET) < 0) { | ||||
| av_log(s, AV_LOG_ERROR, "Failed to restore position after reading index"); | |||||
| av_log(s, AV_LOG_ERROR, "Failed to restore position after reading index\n"); | |||||
| return -1; | return -1; | ||||
| } | } | ||||
| @@ -93,7 +93,7 @@ static int check_disc_info(URLContext *h) | |||||
| "Media stream encrypted with BD+, install and configure libbdplus"); | "Media stream encrypted with BD+, install and configure libbdplus"); | ||||
| } else { | } else { | ||||
| */ | */ | ||||
| av_log(h, AV_LOG_ERROR, "Unable to decrypt BD+ encrypted media"); | |||||
| av_log(h, AV_LOG_ERROR, "Unable to decrypt BD+ encrypted media\n"); | |||||
| /*}*/ | /*}*/ | ||||
| return -1; | return -1; | ||||
| } | } | ||||
| @@ -463,7 +463,7 @@ static int dv_read_timecode(AVFormatContext *s) { | |||||
| if (ret) | if (ret) | ||||
| av_dict_set(&s->metadata, "timecode", timecode, 0); | av_dict_set(&s->metadata, "timecode", timecode, 0); | ||||
| else if (ret < 0) | else if (ret < 0) | ||||
| av_log(s, AV_LOG_ERROR, "Detected timecode is invalid"); | |||||
| av_log(s, AV_LOG_ERROR, "Detected timecode is invalid\n"); | |||||
| finish: | finish: | ||||
| av_free(partial_frame); | av_free(partial_frame); | ||||
| @@ -683,7 +683,7 @@ static int gxf_write_header(AVFormatContext *s) | |||||
| AVDictionaryEntry *tcr = av_dict_get(s->metadata, "timecode", NULL, 0); | AVDictionaryEntry *tcr = av_dict_get(s->metadata, "timecode", NULL, 0); | ||||
| if (!pb->seekable) { | if (!pb->seekable) { | ||||
| av_log(s, AV_LOG_ERROR, "gxf muxer does not support streamed output, patch welcome"); | |||||
| av_log(s, AV_LOG_ERROR, "gxf muxer does not support streamed output, patch welcome\n"); | |||||
| return -1; | return -1; | ||||
| } | } | ||||
| @@ -273,7 +273,7 @@ static int iff_read_header(AVFormatContext *s) | |||||
| if (metadata_tag) { | if (metadata_tag) { | ||||
| if ((res = get_metadata(s, metadata_tag, data_size)) < 0) { | if ((res = get_metadata(s, metadata_tag, data_size)) < 0) { | ||||
| av_log(s, AV_LOG_ERROR, "cannot allocate metadata tag %s!", metadata_tag); | |||||
| av_log(s, AV_LOG_ERROR, "cannot allocate metadata tag %s!\n", metadata_tag); | |||||
| return res; | return res; | ||||
| } | } | ||||
| } | } | ||||
| @@ -92,7 +92,7 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx) | |||||
| while(avio_r8(pb) != HEADER_SIZE && !url_feof(pb)); | while(avio_r8(pb) != HEADER_SIZE && !url_feof(pb)); | ||||
| if(url_feof(pb)) { | if(url_feof(pb)) { | ||||
| av_log(ctx, AV_LOG_ERROR, "Could not find valid start."); | |||||
| av_log(ctx, AV_LOG_ERROR, "Could not find valid start.\n"); | |||||
| return -1; | return -1; | ||||
| } | } | ||||
| @@ -1505,7 +1505,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) | |||||
| ul_index = 6 + pal; | ul_index = 6 + pal; | ||||
| frame_size = pal ? 288000 : 240000; | frame_size = pal ? 288000 : 240000; | ||||
| if (sc->interlaced) { | if (sc->interlaced) { | ||||
| av_log(s, AV_LOG_ERROR, "source marked as interlaced but codec profile is progressive"); | |||||
| av_log(s, AV_LOG_ERROR, "source marked as interlaced but codec profile is progressive\n"); | |||||
| sc->interlaced = 0; | sc->interlaced = 0; | ||||
| } | } | ||||
| break; | break; | ||||
| @@ -61,7 +61,7 @@ static av_cold int oma_write_header(AVFormatContext *s) | |||||
| switch(format->codec_tag) { | switch(format->codec_tag) { | ||||
| case OMA_CODECID_ATRAC3: | case OMA_CODECID_ATRAC3: | ||||
| if (format->channels != 2) { | if (format->channels != 2) { | ||||
| av_log(s, AV_LOG_ERROR, "ATRAC3 in OMA is only supported with 2 channels"); | |||||
| av_log(s, AV_LOG_ERROR, "ATRAC3 in OMA is only supported with 2 channels\n"); | |||||
| return AVERROR(EINVAL); | return AVERROR(EINVAL); | ||||
| } | } | ||||
| if (format->extradata_size == 14) /* WAV format extradata */ | if (format->extradata_size == 14) /* WAV format extradata */ | ||||
| @@ -771,7 +771,7 @@ int ff_parse_fmtp(AVStream *stream, PayloadContext *data, const char *p, | |||||
| int value_size = strlen(p) + 1; | int value_size = strlen(p) + 1; | ||||
| if (!(value = av_malloc(value_size))) { | if (!(value = av_malloc(value_size))) { | ||||
| av_log(stream, AV_LOG_ERROR, "Failed to allocate data for FMTP."); | |||||
| av_log(stream, AV_LOG_ERROR, "Failed to allocate data for FMTP.\n"); | |||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| } | } | ||||