diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 15:42:12 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-17 15:42:12 +0000 |
| commit | ae3c0a9c1f66367586c82e9b48d31bedac3e14aa (patch) | |
| tree | 2ce93c51ce31e84c2f650dbad799404c7a3deb03 | |
| parent | e8ebcb0034c5d4e5df8ff407a5c28d8c53823236 (diff) | |
| parent | c084d6d2cfb570b10d8784eb20cc696dfb7c5605 (diff) | |
| download | ffmpeg-ae3c0a9c1f66367586c82e9b48d31bedac3e14aa.tar.gz | |
Merge commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605'
* commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605':
buffersrc: default SAR to 0 (unknown) rather than 1
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavfilter/buffersrc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index c09379013c..27ad8e49ec 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -225,8 +225,8 @@ static const AVOption buffer_options[] = { { "sar_num", "deprecated, do not use", OFFSET(pixel_aspect.num), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, { "sar_den", "deprecated, do not use", OFFSET(pixel_aspect.den), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, V }, #endif - { "sar", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, DBL_MAX, V }, - { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, DBL_MAX, V }, + { "sar", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, + { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V }, |