| Message ID | 20200831041639.428116-1-chris@miceli.net.au |
|---|---|
| State | Accepted |
| Commit | 41366522899f209d116d663ebedf00e3282e7bb2 |
| Headers | show |
| Series | [FFmpeg-devel] libavformat/dashenc: Reduce confusion in par error message | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On 8/31/20, 9:47 AM, "Chris Miceli" <chris@miceli.net.au> wrote: > >In ticket #8754 there is discourse surrounding the error >message which is printed upon a mismatched aspect ratio in >derived encodings. This should make it clearer to the user >as to the issues which they are experiencing. >--- > libavformat/dashenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c >index dc3306a56a..2d757b3a87 100644 >--- a/libavformat/dashenc.c >+++ b/libavformat/dashenc.c >@@ -1686,7 +1686,7 @@ static int dash_init(AVFormatContext *s) > 1024 * 1024); > > if (as->par.num && av_cmp_q(par, as->par)) { >- av_log(s, AV_LOG_ERROR, "Conflicting stream par values in Adaptation Set %d\n", os->as_idx); >+ av_log(s, AV_LOG_ERROR, "Conflicting stream aspect ratios values in Adaptation Set %d. Please ensure all adaptation sets have the same aspect ratio\n", os->as_idx); > return AVERROR(EINVAL); > } > as->par = par; >-- >2.28.0 LGTM Thanks, Karthick > >_______________________________________________ >ffmpeg-devel mailing list >ffmpeg-devel@ffmpeg.org > >To unsubscribe, visit link above, or email >ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Mon, Aug 31, 2020 at 09:57:17AM +0000, Jeyapal, Karthick wrote: > On 8/31/20, 9:47 AM, "Chris Miceli" <chris@miceli.net.au> wrote: > > > >In ticket #8754 there is discourse surrounding the error > >message which is printed upon a mismatched aspect ratio in > >derived encodings. This should make it clearer to the user > >as to the issues which they are experiencing. > >--- > > libavformat/dashenc.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c > >index dc3306a56a..2d757b3a87 100644 > >--- a/libavformat/dashenc.c > >+++ b/libavformat/dashenc.c > >@@ -1686,7 +1686,7 @@ static int dash_init(AVFormatContext *s) > > 1024 * 1024); > > > > if (as->par.num && av_cmp_q(par, as->par)) { > >- av_log(s, AV_LOG_ERROR, "Conflicting stream par values in Adaptation Set %d\n", os->as_idx); > >+ av_log(s, AV_LOG_ERROR, "Conflicting stream aspect ratios values in Adaptation Set %d. Please ensure all adaptation sets have the same aspect ratio\n", os->as_idx); > > return AVERROR(EINVAL); > > } > > as->par = par; > >-- > >2.28.0 > > LGTM will apply thx [...]
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index dc3306a56a..2d757b3a87 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1686,7 +1686,7 @@ static int dash_init(AVFormatContext *s) 1024 * 1024); if (as->par.num && av_cmp_q(par, as->par)) { - av_log(s, AV_LOG_ERROR, "Conflicting stream par values in Adaptation Set %d\n", os->as_idx); + av_log(s, AV_LOG_ERROR, "Conflicting stream aspect ratios values in Adaptation Set %d. Please ensure all adaptation sets have the same aspect ratio\n", os->as_idx); return AVERROR(EINVAL); } as->par = par;