Merge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'

* commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0':
  opt: Add av_opt_copy()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavutil/opt.c
index eae4f75dcd37f8889f40d5d528f33a7a221eef51,01502435b772eacfa5f23e007420466a5decda1d..cbe36dfd922c06412037e2b7bf1d05468d6ba9d6
--- 1/libavutil/opt.c
--- 2/libavutil/opt.c
+++ b/libavutil/opt.c
@@@ -1579,15 -766,10 +1579,15 @@@ static int opt_size(enum AVOptionType t
      case AV_OPT_TYPE_DOUBLE:    return sizeof(double);
      case AV_OPT_TYPE_FLOAT:     return sizeof(float);
      case AV_OPT_TYPE_STRING:    return sizeof(uint8_t*);
 +    case AV_OPT_TYPE_VIDEO_RATE:
      case AV_OPT_TYPE_RATIONAL:  return sizeof(AVRational);
      case AV_OPT_TYPE_BINARY:    return sizeof(uint8_t*) + sizeof(int);
 +    case AV_OPT_TYPE_IMAGE_SIZE:return sizeof(int[2]);
 +    case AV_OPT_TYPE_PIXEL_FMT: return sizeof(enum AVPixelFormat);
 +    case AV_OPT_TYPE_SAMPLE_FMT:return sizeof(enum AVSampleFormat);
 +    case AV_OPT_TYPE_COLOR:     return 4;
      }
-     return 0;
+     return AVERROR(EINVAL);
  }
  
  int av_opt_copy(void *dst, const void *src)
@@@ -1627,17 -812,12 +1627,21 @@@
              *(int*)(field_dst8 + 1) = len;
          } else if (o->type == AV_OPT_TYPE_CONST) {
              // do nothing
 +        } else if (o->type == AV_OPT_TYPE_DICT) {
 +            AVDictionary **sdict = (AVDictionary **) field_src;
 +            AVDictionary **ddict = (AVDictionary **) field_dst;
 +            if (*sdict != *ddict)
 +                av_dict_free(ddict);
 +            *ddict = NULL;
 +            av_dict_copy(ddict, *sdict, 0);
 +            if (av_dict_count(*sdict) != av_dict_count(*ddict))
 +                ret = AVERROR(ENOMEM);
          } else {
-             memcpy(field_dst, field_src, opt_size(o->type));
+             int size = opt_size(o->type);
+             if (size < 0)
+                 ret = size;
+             else
+                 memcpy(field_dst, field_src, size);
          }
      }
      return ret;

diff --cc libavutil/version.h
index cf7458ec2306fe5011f912c17fc9c8bc69c928c7,186ebd8eb5e8237fd40ade16f3128c27910e1cee..24bd0d0ab33612c037f6fb09b5fc1950feac46a3
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -63,9 -53,9 +63,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 55
 -#define LIBAVUTIL_VERSION_MINOR 10
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  55
 +#define LIBAVUTIL_VERSION_MINOR  22
- #define LIBAVUTIL_VERSION_MICRO 100
++#define LIBAVUTIL_VERSION_MICRO 101
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \