Merge remote-tracking branch 'origin/master' into my_master

Conflicts:
	mplayer.c
	screenshot.c

1 files changed, 4 insertions, 2 deletions

diff --git a/av_opts.c b/av_opts.c
index 59f47edf52..bc2e392c5f 100644
--- a/av_opts.c
+++ b/av_opts.c
@@ -21,8 +21,10 @@
 
 #include <stdlib.h>
 #include <string.h>
+
+#include <libavutil/opt.h>
+
 #include "av_opts.h"
-#include "libavcodec/opt.h"
 
 int parse_avopts(void *v, char *str){
     char *start;
@@ -37,7 +39,7 @@ int parse_avopts(void *v, char *str){
         arg     = strchr(str, '=');
         if(arg)      *arg++= 0;
 
-        if (av_set_string3(v, str, arg, 0, NULL) < 0) {
+        if (av_opt_set(v, str, arg, AV_OPT_SEARCH_CHILDREN) < 0) {
             free(start);
             return -1;
         }