• Michael Niedermayer's avatar
    Merge commit '124134e4' · d5f65e9d
    Michael Niedermayer authored
    * commit '124134e4':
      avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member
    
    Conflicts:
    	libavcodec/aacenc.c
    	libavcodec/libopenjpegenc.c
    	libavcodec/options_table.h
    	libavdevice/bktr.c
    	libavdevice/v4l2.c
    	libavdevice/x11grab.c
    	libavfilter/af_amix.c
    	libavfilter/vf_drawtext.c
    	libavformat/movenc.c
    	libavformat/options_table.h
    	libavutil/opt.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d5f65e9d
v4l.c 11.7 KB