From 66d02d3ca626664b7cdaf9b21a44b130959c6c24 Mon Sep 17 00:00:00 2001 From: Moritz Barsnick Date: Tue, 19 Aug 2014 14:28:35 +0200 Subject: [PATCH] align and correct messages regarding bitstream filters The messages regarding the recommended use of bitstream filters are somewhat different. This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb". Signed-off-by: Michael Niedermayer --- libavformat/flvenc.c | 2 +- libavformat/movenc.c | 2 +- libavformat/mpegtsenc.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index dd74d4c4da..febc5e5b30 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -521,7 +521,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { if (!s->streams[pkt->stream_index]->nb_frames) { av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: " - "use audio bitstream filter 'aac_adtstoasc' to fix it " + "use the audio bitstream filter 'aac_adtstoasc' to fix it " "('-bsf:a aac_adtstoasc' option with ffmpeg)\n"); return AVERROR_INVALIDDATA; } diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2b801b7522..bf613911b7 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3517,7 +3517,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) { if (!s->streams[pkt->stream_index]->nb_frames) { av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: " - "use audio bitstream filter 'aac_adtstoasc' to fix it " + "use the audio bitstream filter 'aac_adtstoasc' to fix it " "('-bsf:a aac_adtstoasc' option with ffmpeg)\n"); return -1; } diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 208360f465..0184d87149 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1193,7 +1193,8 @@ int ff_check_h264_startcode(AVFormatContext *s, const AVStream *st, const AVPack if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) { if (!st->nb_frames) { av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, " - "no startcode found, use the h264_mp4toannexb bitstream filter (-bsf h264_mp4toannexb)\n"); + "no startcode found, use the video bitstream filter 'h264_mp4toannexb' to fix it " + "('-bsf:v h264_mp4toannexb' option with ffmpeg)\n"); return AVERROR_INVALIDDATA; } av_log(s, AV_LOG_WARNING, "H.264 bitstream error, startcode missing\n");