aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@gmail.com>2013-02-01 18:58:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-01 22:54:18 +0100
commit5a67e30b1c71dc0a84779b543d95ca20faa8cbed (patch)
tree083431094baa6a87963d13176963fb7a31fb51b5 /ffmpeg_opt.c
parent423856c4ae850d50f389245b97039023adfd1b3e (diff)
downloadandroid_external_ffmpeg-5a67e30b1c71dc0a84779b543d95ca20faa8cbed.tar.gz
android_external_ffmpeg-5a67e30b1c71dc0a84779b543d95ca20faa8cbed.tar.bz2
android_external_ffmpeg-5a67e30b1c71dc0a84779b543d95ca20faa8cbed.zip
ffmpeg: fix broken channel_layout option
Fixes ticket #2163. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index b285f4ce88..a418e86167 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2140,7 +2140,7 @@ static int opt_channel_layout(void *optctx, const char *opt, const char *arg)
return AVERROR(EINVAL);
}
snprintf(layout_str, sizeof(layout_str), "%"PRIu64, layout);
- ret = opt_default(NULL, opt, layout_str);
+ ret = opt_default_new(o, opt, layout_str);
if (ret < 0)
return ret;